x/python-ganttclient
Code Issues Proposed changes

refactored tests

Browse Source
This commit is contained in:
John Tran
2011-08-02 10:06:22 -07:00
parent f0f7fd4b80
commit 653911e39b
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
nova/tests/test_network.py
View File

@@ -254,7 +254,9 @@ class CommonNetworkTestCase(test.TestCase):
raise exception.NetworkNotFoundForCidr() raise exception.NetworkNotFoundForCidr()
def network_create_safe(self, context, net): def network_create_safe(self, context, net):
return {'foo': 'bar'} fakenet = {}
fakenet['id'] = 999
return fakenet
def network_get_all(self, context): def network_get_all(self, context):
raise exception.NoNetworksFound() raise exception.NoNetworksFound()
@@ -266,6 +268,9 @@ class CommonNetworkTestCase(test.TestCase):
def deallocate_fixed_ip(self, context, address): def deallocate_fixed_ip(self, context, address):
self.deallocate_called = address self.deallocate_called = address
def fake_create_fixed_ips(self, context, network_id):
return None
def test_remove_fixed_ip_from_instance(self): def test_remove_fixed_ip_from_instance(self):
manager = self.FakeNetworkManager() manager = self.FakeNetworkManager()
manager.remove_fixed_ip_from_instance(None, 99, '10.0.0.1') manager.remove_fixed_ip_from_instance(None, 99, '10.0.0.1')
@@ -372,16 +377,11 @@ class CommonNetworkTestCase(test.TestCase):
def test_create_networks(self): def test_create_networks(self):
cidr = '192.168.0.0/24' cidr = '192.168.0.0/24'
manager = self.FakeNetworkManager() manager = self.FakeNetworkManager()
self.mox.StubOutWithMock(manager.db, 'network_create_safe') self.stubs.Set(manager, '_create_fixed_ips',
ignore = mox.IgnoreArg() self.fake_create_fixed_ips)
fakecidr= {'id': 1, 'cidr': cidr}
manager.db.network_create_safe(ignore, ignore).AndReturn(fakecidr)
self.mox.StubOutWithMock(manager, '_create_fixed_ips')
manager._create_fixed_ips(ignore, ignore).AndReturn('foo')
self.mox.ReplayAll()
args = [None, 'foo', cidr, None, 1, 256, 'fd00::/48', None, None, args = [None, 'foo', cidr, None, 1, 256, 'fd00::/48', None, None,
None] None]
# making it to the end, without err, is enough validation result = manager.create_networks(*args)
self.assertEqual(manager.create_networks(*args), None) self.assertEqual(manager.create_networks(*args), None)
def test_create_networks_cidr_already_used(self): def test_create_networks_cidr_already_used(self):
@@ -394,3 +394,12 @@ class CommonNetworkTestCase(test.TestCase):
args = [None, 'foo', '192.168.0.0/24', None, 1, 256, args = [None, 'foo', '192.168.0.0/24', None, 1, 256,
'fd00::/48', None, None, None] 'fd00::/48', None, None, None]
self.assertRaises(ValueError, manager.create_networks, *args) self.assertRaises(ValueError, manager.create_networks, *args)
def test_create_networks_many(self):
cidr = '192.168.0.0/16'
manager = self.FakeNetworkManager()
self.stubs.Set(manager, '_create_fixed_ips',
self.fake_create_fixed_ips)
args = [None, 'foo', cidr, None, 10, 256, 'fd00::/48', None, None,
None]
self.assertEqual(manager.create_networks(*args), None)