summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-09-08 15:26:44 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-09-08 15:26:44 -0400
commit4bf6508a026c62a7aa2423b1910c871ddc3f0916 (patch)
tree1e299c55660d314ac82fd567cf31657b708c60aa /nova/tests
parent6cbbdb909443a33c2af8ddd73b861cd41201fa0b (diff)
converting fix to just address ec2; updating test
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_cloud.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index 3fe6a9b42..7fe353b3d 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -486,11 +486,9 @@ class CloudTestCase(test.TestCase):
inst2 = db.instance_create(self.context, args2)
db.instance_destroy(self.context, inst1.id)
result = self.cloud.describe_instances(self.context)
+ self.assertEqual(len(result['reservationSet']), 1)
result1 = result['reservationSet'][0]['instancesSet']
self.assertEqual(result1[0]['instanceId'],
- ec2utils.id_to_ec2_id(inst1.id))
- result2 = result['reservationSet'][1]['instancesSet']
- self.assertEqual(result2[0]['instanceId'],
ec2utils.id_to_ec2_id(inst2.id))
def _block_device_mapping_create(self, instance_id, mappings):