summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorEldar Nugaev <reldan@oscloud.ru>2011-06-27 17:05:35 +0400
committerEldar Nugaev <reldan@oscloud.ru>2011-06-27 17:05:35 +0400
commit75dd73b1246904fd11bf9b566bf2319d3e6bada5 (patch)
treeede946585e6106555802a491834a90d29da0c001 /nova/tests
parentef1f4d33fa5763ea602c2fc1098a4b230b86e82b (diff)
fixed pep style
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/contrib/test_floating_ips.py9
-rw-r--r--nova/tests/api/openstack/fakes.py2
2 files changed, 3 insertions, 8 deletions
diff --git a/nova/tests/api/openstack/contrib/test_floating_ips.py b/nova/tests/api/openstack/contrib/test_floating_ips.py
index 4a74861bd..bf62925aa 100644
--- a/nova/tests/api/openstack/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/contrib/test_floating_ips.py
@@ -144,8 +144,7 @@ class FloatingIpTest(test.TestCase):
ip = json.loads(res.body)['allocated']
expected = {
"id": 1,
- "floating_ip": '10.10.10.10'
- }
+ "floating_ip": '10.10.10.10'}
self.assertEqual(ip, expected)
def test_floating_ip_release(self):
@@ -156,8 +155,7 @@ class FloatingIpTest(test.TestCase):
actual = json.loads(res.body)['released']
expected = {
"id": 1,
- "floating_ip": '10.10.10.10'
- }
+ "floating_ip": '10.10.10.10'}
self.assertEqual(actual, expected)
def test_floating_ip_associate(self):
@@ -184,6 +182,5 @@ class FloatingIpTest(test.TestCase):
ip = json.loads(res.body)['disassociated']
expected = {
"floating_ip": '10.10.10.10',
- "fixed_ip": '11.0.0.1'
- }
+ "fixed_ip": '11.0.0.1'}
self.assertEqual(ip, expected)
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index 2ecdd111f..eeb96cb12 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -37,11 +37,9 @@ from nova.api.openstack import versions
from nova.api.openstack import limits
from nova.auth.manager import User, Project
import nova.image.fake
-
from nova.image import glance
from nova.image import service
from nova.tests import fake_flags
-
from nova.wsgi import Router