Merge "Save the original base image ref for snapshots."

1 files changed, 7 insertions, 3 deletions

diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 7b5f7dca7..324c32084 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -2526,10 +2526,14 @@ class ComputeAPITestCase(BaseTestCase):
         try:
             sys_metadata = db.instance_system_metadata_get(self.context,
                     ref[0]['uuid'])
-            self.assertEqual(sys_metadata,
-                    {'image_kernel_id': 'fake_kernel_id',
+
+            image_props = {'image_kernel_id': 'fake_kernel_id',
                      'image_ramdisk_id': 'fake_ramdisk_id',
-                     'image_something_else': 'meow', })
+                     'image_something_else': 'meow', }
+            for key, value in image_props.iteritems():
+                self.assertTrue(key in sys_metadata)
+                self.assertEqual(value, sys_metadata[key])
+
         finally:
             db.instance_destroy(self.context, ref[0]['uuid'])