summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-03-17 07:30:22 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-03-17 07:30:22 -0700
commitabc6c82449dfc46a33dcd8190840e51f44b5b930 (patch)
treeb01e70f267e5f74bfeb857ecb81ae88faf770aad /nova/tests
parent40c27fc4ad4653155b676079f2e2677d18aee9ef (diff)
downloadnova-abc6c82449dfc46a33dcd8190840e51f44b5b930.tar.gz
nova-abc6c82449dfc46a33dcd8190840e51f44b5b930.tar.xz
nova-abc6c82449dfc46a33dcd8190840e51f44b5b930.zip
Replaced capability flags with List
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/test_zones.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/test_zones.py b/nova/tests/api/openstack/test_zones.py
index 5e3aee4a7..12d39fd29 100644
--- a/nova/tests/api/openstack/test_zones.py
+++ b/nova/tests/api/openstack/test_zones.py
@@ -178,7 +178,7 @@ class ZonesTest(test.TestCase):
def test_zone_info(self):
FLAGS.zone_name = 'darksecret'
- FLAGS.zone_capabilities = 'cap1:a,b;cap2:c,d'
+ FLAGS.zone_capabilities = ['cap1=a;b', 'cap2=c;d']
self.stubs.Set(api, '_call_scheduler', zone_caps)
body = dict(zone=dict(username='zeb', password='sneaky'))
@@ -188,5 +188,5 @@ class ZonesTest(test.TestCase):
res_dict = json.loads(res.body)
self.assertEqual(res.status_int, 200)
self.assertEqual(res_dict['zone']['name'], 'darksecret')
- self.assertEqual(res_dict['zone']['cap1'], 'a,b')
- self.assertEqual(res_dict['zone']['cap2'], 'c,d')
+ self.assertEqual(res_dict['zone']['cap1'], 'a;b')
+ self.assertEqual(res_dict['zone']['cap2'], 'c;d')