From de5b1ce17a44e824f1f29ead19dac45db4e0086c Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Mon, 30 Aug 2010 15:11:46 -0700 Subject: all tests pass again --- nova/tests/compute_unittest.py | 30 +++++++++++++++++------------- nova/tests/network_unittest.py | 7 +++---- nova/tests/volume_unittest.py | 7 ++++--- 3 files changed, 24 insertions(+), 20 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/compute_unittest.py b/nova/tests/compute_unittest.py index 28e51f387..a8d644c84 100644 --- a/nova/tests/compute_unittest.py +++ b/nova/tests/compute_unittest.py @@ -40,7 +40,7 @@ class InstanceXmlTestCase(test.TrialTestCase): # instance_id = 'foo' # first_node = node.Node() - # inst = yield first_node.run_instance(instance_id) + # inst = yield first_node.run_instance(self.context, instance_id) # # # force the state so that we can verify that it changes # inst._s['state'] = node.Instance.NOSTATE @@ -50,7 +50,7 @@ class InstanceXmlTestCase(test.TrialTestCase): # second_node = node.Node() # new_inst = node.Instance.fromXml(second_node._conn, pool=second_node._pool, xml=xml) # self.assertEqual(new_inst.state, node.Instance.RUNNING) - # rv = yield first_node.terminate_instance(instance_id) + # rv = yield first_node.terminate_instance(self.context, instance_id) class ComputeConnectionTestCase(test.TrialTestCase): @@ -63,6 +63,7 @@ class ComputeConnectionTestCase(test.TrialTestCase): self.manager = manager.AuthManager() user = self.manager.create_user('fake', 'fake', 'fake') project = self.manager.create_project('fake', 'fake', 'fake') + self.context = None def tearDown(self): self.manager.delete_user('fake') @@ -84,13 +85,13 @@ class ComputeConnectionTestCase(test.TrialTestCase): def test_run_describe_terminate(self): instance_id = self._create_instance() - yield self.compute.run_instance(instance_id) + yield self.compute.run_instance(self.context, instance_id) instances = db.instance_get_all(None) logging.info("Running instances: %s", instances) self.assertEqual(len(instances), 1) - yield self.compute.terminate_instance(instance_id) + yield self.compute.terminate_instance(self.context, instance_id) instances = db.instance_get_all(None) logging.info("After terminating instances: %s", instances) @@ -99,22 +100,25 @@ class ComputeConnectionTestCase(test.TrialTestCase): @defer.inlineCallbacks def test_reboot(self): instance_id = self._create_instance() - yield self.compute.run_instance(instance_id) - yield self.compute.reboot_instance(instance_id) - yield self.compute.terminate_instance(instance_id) + yield self.compute.run_instance(self.context, instance_id) + yield self.compute.reboot_instance(self.context, instance_id) + yield self.compute.terminate_instance(self.context, instance_id) @defer.inlineCallbacks def test_console_output(self): instance_id = self._create_instance() - rv = yield self.compute.run_instance(instance_id) + rv = yield self.compute.run_instance(self.context, instance_id) - console = yield self.compute.get_console_output(instance_id) + console = yield self.compute.get_console_output(self.context, + instance_id) self.assert_(console) - rv = yield self.compute.terminate_instance(instance_id) + rv = yield self.compute.terminate_instance(self.context, instance_id) @defer.inlineCallbacks def test_run_instance_existing(self): instance_id = self._create_instance() - yield self.compute.run_instance(instance_id) - self.assertFailure(self.compute.run_instance(instance_id), exception.Error) - yield self.compute.terminate_instance(instance_id) + yield self.compute.run_instance(self.context, instance_id) + self.assertFailure(self.compute.run_instance(self.context, + instance_id), + exception.Error) + yield self.compute.terminate_instance(self.context, instance_id) diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index e3fe01fa2..b479f2fa4 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -253,12 +253,11 @@ class NetworkTestCase(test.TrialTestCase): def is_allocated_in_project(address, project_id): """Returns true if address is in specified project""" - fixed_ip = db.fixed_ip_get_by_address(None, address) project_net = db.project_get_network(None, project_id) + network = db.fixed_ip_get_network(None, address) + instance = db.fixed_ip_get_instance(None, address) # instance exists until release - logging.debug('fixed_ip.instance: %s', fixed_ip.instance) - logging.debug('project_net: %s', project_net) - return fixed_ip.instance is not None and fixed_ip.network == project_net + return instance is not None and network['id'] == project_net['id'] def binpath(script): diff --git a/nova/tests/volume_unittest.py b/nova/tests/volume_unittest.py index 4504276e2..6573e9876 100644 --- a/nova/tests/volume_unittest.py +++ b/nova/tests/volume_unittest.py @@ -117,6 +117,7 @@ class VolumeTestCase(test.TrialTestCase): else: rv = yield self.compute.detach_volume(instance_id, volume_id) + vol = db.volume_get(None, volume_id) self.assertEqual(vol['status'], "available") rv = self.volume.delete_volume(self.context, volume_id) @@ -134,9 +135,9 @@ class VolumeTestCase(test.TrialTestCase): volume_ids = [] def _check(volume_id): volume_ids.append(volume_id) - vol = db.volume_get(None, volume_id) - shelf_blade = '%s.%s' % (vol.export_device.shelf_id, - vol.export_device.blade_id) + (shelf_id, blade_id) = db.volume_get_shelf_and_blade(None, + volume_id) + shelf_blade = '%s.%s' % (shelf_id, blade_id) self.assert_(shelf_blade not in shelf_blades) shelf_blades.append(shelf_blade) logging.debug("got %s" % shelf_blade) -- cgit