From 1a564ea028c202c193a40ec74639f08a4657cb30 Mon Sep 17 00:00:00 2001 From: Rick Harris Date: Fri, 16 Sep 2011 11:17:44 -0500 Subject: [PATCH] Fixing tests, PEP8 failures --- nova/tests/test_xenapi.py | 6 ++++-- nova/tests/xenapi/stubs.py | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 4541a21c..6b5bb240 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -783,7 +783,8 @@ class XenAPIMigrateInstance(test.TestCase): self.stubs.Set(stubs.FakeSessionForMigrationTests, "VDI_resize_online", fake_vdi_resize) self.stubs.Set(vmops.VMOps, '_start', fake_vm_start) - self.stubs.Set(vmops.VMOps, 'finish_revert_migration', fake_finish_revert_migration) + self.stubs.Set(vmops.VMOps, 'finish_revert_migration', + fake_finish_revert_migration) stubs.stubout_session(self.stubs, stubs.FakeSessionForMigrationTests) stubs.stubout_loopingcall_start(self.stubs) @@ -852,7 +853,8 @@ class XenAPIMigrateInstance(test.TestCase): def test_finish_migrate_no_local_storage(self): tiny_type_id = \ instance_types.get_instance_type_by_name('m1.tiny')['id'] - self.instance_values.update({'instance_type_id': tiny_type_id, 'local_gb': 0}) + self.instance_values.update({'instance_type_id': tiny_type_id, + 'local_gb': 0}) instance = db.instance_create(self.context, self.instance_values) def fake_vdi_resize(*args, **kwargs): diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py index a1f6a778..aee27992 100644 --- a/nova/tests/xenapi/stubs.py +++ b/nova/tests/xenapi/stubs.py @@ -295,6 +295,9 @@ class FakeSessionForMigrationTests(fake.SessionBase): vm['is_control_domain'] = False vm['domid'] = random.randrange(1, 1 << 16) + def VM_set_name_label(self, *args): + pass + def stub_out_migration_methods(stubs): def fake_create_snapshot(self, instance):