diff options
| author | Jason Kölker <jason@koelker.net> | 2011-06-02 11:43:53 -0500 |
|---|---|---|
| committer | Jason Kölker <jason@koelker.net> | 2011-06-02 11:43:53 -0500 |
| commit | 14e075a3f71f21ea1b64cd6214deea9ef3913a71 (patch) | |
| tree | b87348098b77a8c76d9c2467b28b8501b25a6e73 | |
| parent | 799e847f46391d999174d8c2a88fc6c5c3ab7d5d (diff) | |
| download | nova-14e075a3f71f21ea1b64cd6214deea9ef3913a71.tar.gz nova-14e075a3f71f21ea1b64cd6214deea9ef3913a71.tar.xz nova-14e075a3f71f21ea1b64cd6214deea9ef3913a71.zip | |
pep8 fixes
| -rw-r--r-- | nova/tests/db/fakes.py | 6 | ||||
| -rw-r--r-- | nova/tests/network/base.py | 5 | ||||
| -rw-r--r-- | nova/tests/test_flat_network.py | 1 |
3 files changed, 3 insertions, 9 deletions
diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py index 114deaef2..670c46f62 100644 --- a/nova/tests/db/fakes.py +++ b/nova/tests/db/fakes.py @@ -77,7 +77,7 @@ def stub_out_db_network_api(stubs, host='localhost'): floating_ip_fields = {'id': 0, 'address': '192.168.1.100', 'fixed_ip_id': 0, - 'fixed_ip': None, + 'fixed_ip': None, 'project_id': 'fake', 'host': host, 'auto_assigned': False} @@ -85,14 +85,13 @@ def stub_out_db_network_api(stubs, host='localhost'): mac_address_fields = {'id': 0, 'address': 'DE:AD:BE:EF:00:00', 'network_id': 0, - 'instance_id':0, + 'instance_id': 0, 'network': FakeModel(network_fields)} networks = {0: network_fields} fixed_ips = {0: fixed_ip_fields} floating_ips = {0: floating_ip_fields} mac_addresses = {0: mac_address_fields} - def fake_floating_ip_allocate_address(context, host, project_id): floating_ip_fields['project_id'] = project_id @@ -102,7 +101,6 @@ def stub_out_db_network_api(stubs, host='localhost'): floating_ip_fields['project_id'] = None floating_ip_fields['auto_assigned'] = False - def fake_floating_ip_disassociate(context, address): if floating_ip_fields['address'] == address: fixed_ip = floating_ip_fields['fixed_ip']['address'] diff --git a/nova/tests/network/base.py b/nova/tests/network/base.py index f22ab0158..f585cdd05 100644 --- a/nova/tests/network/base.py +++ b/nova/tests/network/base.py @@ -54,8 +54,7 @@ class TestFuncs(object): def test_set_network_hosts(self): db_fakes.stub_out_db_network_api(self.stubs, host=None) self.network.set_network_hosts(self.context) - - + def test_set_network_host(self): host = self.network.host self.assertEqual(self.network.set_network_host(self.context, 0), @@ -85,7 +84,5 @@ class TestFuncs(object): 'rxtx_cap': 3})] self.assertEqual(static_info, nw) - def test_deallocate_for_instance(self): pass - diff --git a/nova/tests/test_flat_network.py b/nova/tests/test_flat_network.py index 7e1252749..8a5d17ae9 100644 --- a/nova/tests/test_flat_network.py +++ b/nova/tests/test_flat_network.py @@ -29,4 +29,3 @@ LOG = logging.getLogger('nova.tests.network') # def setUp(self): # super(FlatNetworkTestCase, self).setUp() - |