diff --git a/nova/tests/compute_unittest.py b/nova/tests/compute_unittest.py index a8d644c8..0166dc4b 100644 --- a/nova/tests/compute_unittest.py +++ b/nova/tests/compute_unittest.py @@ -48,7 +48,8 @@ class InstanceXmlTestCase(test.TrialTestCase): # self.assert_(ElementTree.parse(StringIO.StringIO(xml))) # # second_node = node.Node() - # new_inst = node.Instance.fromXml(second_node._conn, pool=second_node._pool, xml=xml) + # 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(self.context, instance_id) diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index b284e4e5..15ec8dbf 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -140,7 +140,8 @@ class NetworkTestCase(test.TrialTestCase): db.fixed_ip_deallocate(None, address2) release_ip(address2) - self.assertFalse(is_allocated_in_project(address2, self.projects[1].id)) + self.assertFalse(is_allocated_in_project(address2, + self.projects[1].id)) def test_subnet_edge(self): """Makes sure that private ips don't overlap""" @@ -190,7 +191,6 @@ class NetworkTestCase(test.TrialTestCase): for project in projects: self.manager.delete_project(project) - def test_ips_are_reused(self): """Makes sure that ip addresses that are deallocated get reused""" address = self._create_address(0) @@ -224,8 +224,6 @@ class NetworkTestCase(test.TrialTestCase): """Test for a NoMoreAddresses exception when all fixed ips are used. """ network = db.project_get_network(None, self.projects[0].id) - - num_available_ips = db.network_count_available_ips(None, network['id']) addresses = [] diff --git a/nova/tests/service_unittest.py b/nova/tests/service_unittest.py index e13fe62d..902f9bab 100644 --- a/nova/tests/service_unittest.py +++ b/nova/tests/service_unittest.py @@ -20,10 +20,7 @@ Unit Tests for remote procedure calls using queue """ -import logging - import mox -from twisted.internet import defer from nova import exception from nova import flags @@ -33,33 +30,37 @@ from nova import service from nova import manager FLAGS = flags.FLAGS - flags.DEFINE_string("fake_manager", "nova.tests.service_unittest.FakeManager", "Manager for testing") + class FakeManager(manager.Manager): """Fake manager for tests""" pass + class ServiceTestCase(test.BaseTestCase): """Test cases for rpc""" + def setUp(self): # pylint: disable=C0103 super(ServiceTestCase, self).setUp() self.mox.StubOutWithMock(service, 'db') def test_create(self): - self.mox.StubOutWithMock(rpc, 'AdapterConsumer', use_mock_anything=True) + self.mox.StubOutWithMock(rpc, + 'AdapterConsumer', + use_mock_anything=True) self.mox.StubOutWithMock( service.task, 'LoopingCall', use_mock_anything=True) rpc.AdapterConsumer(connection=mox.IgnoreArg(), topic='fake', - proxy=mox.IsA(service.Service) - ).AndReturn(rpc.AdapterConsumer) + proxy=mox.IsA(service.Service)).AndReturn( + rpc.AdapterConsumer) rpc.AdapterConsumer(connection=mox.IgnoreArg(), topic='fake.%s' % FLAGS.node_name, - proxy=mox.IsA(service.Service) - ).AndReturn(rpc.AdapterConsumer) + proxy=mox.IsA(service.Service)).AndReturn( + rpc.AdapterConsumer) # Stub out looping call a bit needlessly since we don't have an easy # way to cancel it (yet) when the tests finishes @@ -80,7 +81,6 @@ class ServiceTestCase(test.BaseTestCase): # whether it is disconnected, it looks for a variable on itself called # 'model_disconnected' and report_state doesn't really do much so this # these are mostly just for coverage - def test_report_state(self): node_name = 'foo' binary = 'bar' @@ -99,7 +99,6 @@ class ServiceTestCase(test.BaseTestCase): s = service.Service() rv = yield s.report_state(node_name, binary) - def test_report_state_no_daemon(self): node_name = 'foo' binary = 'bar' @@ -115,7 +114,8 @@ class ServiceTestCase(test.BaseTestCase): service.db.daemon_get_by_args(None, node_name, binary).AndRaise(exception.NotFound()) - service.db.daemon_create(None, daemon_create).AndReturn(daemon_ref['id']) + service.db.daemon_create(None, + daemon_create).AndReturn(daemon_ref['id']) service.db.daemon_get(None, daemon_ref['id']).AndReturn(daemon_ref) service.db.daemon_update(None, daemon_ref['id'], mox.ContainsKeyValue('report_count', 1)) @@ -124,7 +124,6 @@ class ServiceTestCase(test.BaseTestCase): s = service.Service() rv = yield s.report_state(node_name, binary) - def test_report_state_newly_disconnected(self): node_name = 'foo' binary = 'bar' @@ -144,7 +143,6 @@ class ServiceTestCase(test.BaseTestCase): self.assert_(s.model_disconnected) - def test_report_state_newly_connected(self): node_name = 'foo' binary = 'bar' @@ -166,4 +164,3 @@ class ServiceTestCase(test.BaseTestCase): rv = yield s.report_state(node_name, binary) self.assert_(not s.model_disconnected) - diff --git a/nova/tests/volume_unittest.py b/nova/tests/volume_unittest.py index 6573e987..f42d0ac8 100644 --- a/nova/tests/volume_unittest.py +++ b/nova/tests/volume_unittest.py @@ -26,7 +26,6 @@ from nova import flags from nova import test from nova import utils - FLAGS = flags.FLAGS @@ -40,7 +39,6 @@ class VolumeTestCase(test.TrialTestCase): self.volume = utils.import_object(FLAGS.volume_manager) self.context = None - def _create_volume(self, size='0'): vol = {} vol['size'] = '0' @@ -133,6 +131,7 @@ class VolumeTestCase(test.TrialTestCase): project_id = 'fake' shelf_blades = [] volume_ids = [] + def _check(volume_id): volume_ids.append(volume_id) (shelf_id, blade_id) = db.volume_get_shelf_and_blade(None,