Ensure copy and original image IDs differ.

Ensure the copy_from tests have unmarshalled a distinct ID for the
copied image, in order to eliminate the possibility that the subsequent
deletion of the original image impacts on the existence of the copy.

Eliminates one bizarre and unlikely explanation for the test failures
reported in bug 955527.

Change-Id: If8d0720f6d08cdc57a3e01431bd3460d95a868a9

glance/tests/functional/test_copy_to_file.py

@@ -111,6 +111,7 @@ def _do_test_copy_from(self, from_store, get_uri):
         data = json.loads(content)
 
         copy_image_id = data['image']['id']
+        self.assertNotEqual(copy_image_id, original_image_id)
 
         # GET image and make sure image content is as expected
         path = "http://%s:%d/v1/images/%s" % ("0.0.0.0", self.api_port,

glance/tests/functional/test_s3.py

@@ -209,6 +209,7 @@ def _do_test_copy_from(self, from_store, get_uri):
         data = json.loads(content)
 
         copy_image_id = data['image']['id']
+        self.assertNotEqual(copy_image_id, original_image_id)
 
         # GET image and make sure image content is as expected
         path = "http://%s:%d/v1/images/%s" % ("0.0.0.0", self.api_port,

glance/tests/functional/test_swift.py

@@ -480,6 +480,7 @@ def _do_test_copy_from(self, from_store, get_uri):
         data = json.loads(content)
 
         copy_image_id = data['image']['id']
+        self.assertNotEqual(copy_image_id, original_image_id)
 
         # GET image and make sure image content is as expected
         path = "http://%s:%d/v1/images/%s" % ("0.0.0.0", self.api_port,