summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Smith <code@term.ie>2011-01-12 15:21:18 -0800
committerAndy Smith <code@term.ie>2011-01-12 15:21:18 -0800
commit3df3c2359369fc74d78cb566545fbc54d0627c7e (patch)
treeb076cebff218570ace76bef07ea04a28ec0ea6a2
parent1f59fcb405e16869c9cc94f54cda6e6aae23fc40 (diff)
standardize volume ids
-rw-r--r--nova/tests/test_cloud.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index c751832ec..2e350cd5a 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -127,9 +127,12 @@ class CloudTestCase(test.TestCase):
result = self.cloud.describe_volumes(self.context)
self.assertEqual(len(result['volumeSet']), 2)
volume_id = cloud.id_to_ec2_id(vol2['id'], 'vol-%08x')
- result = self.cloud.describe_volumes(self.context, volume_id=[volume_id])
+ result = self.cloud.describe_volumes(self.context,
+ volume_id=[volume_id])
self.assertEqual(len(result['volumeSet']), 1)
- self.assertEqual(cloud.ec2_id_to_id(result['volumeSet'][0]['volumeId']), vol2['id'])
+ self.assertEqual(
+ cloud.ec2_id_to_id(result['volumeSet'][0]['volumeId']),
+ vol2['id'])
db.volume_destroy(self.context, vol1['id'])
db.volume_destroy(self.context, vol2['id'])