summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-02-21 14:28:48 +0100
committerSoren Hansen <soren@linux2go.dk>2011-02-21 14:28:48 +0100
commit18174983d861aeea39effb536670e2801ce7e090 (patch)
tree4405188f4a9afa0bb62e9ce9313762ed59fd31f7 /nova/tests
parenta57dffb5fdfbfac59b9ddbe7b33d6f03b7b748ba (diff)
parentbd0ca93866b48a7a65de8b97ab0ac0ac9c737f73 (diff)
Merge trunk
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/test_zones.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/test_zones.py b/nova/tests/api/openstack/test_zones.py
index 5542a1cf3..df497ef1b 100644
--- a/nova/tests/api/openstack/test_zones.py
+++ b/nova/tests/api/openstack/test_zones.py
@@ -57,8 +57,7 @@ def zone_get_all(context):
dict(id=1, api_url='http://foo.com', username='bob',
password='xxx'),
dict(id=2, api_url='http://blah.com', username='alice',
- password='qwerty')
- ]
+ password='qwerty')]
class ZonesTest(unittest.TestCase):