From 7a437905f25a0e9931747d84fe5e5366b5931d7c Mon Sep 17 00:00:00 2001
From: Orit Wasserman <owasserm@redhat.com>
Date: Wed, 14 Sep 2016 14:23:49 +0200
Subject: [PATCH] fix test_object_copy_versioned_bucket

Do not use _create_key_with_random_content as it creates a new bucket.
Check objects content and size

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---
 s3tests/functional/test_s3.py | 40 ++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py
index 2757c68..4830aae 100644
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@ -4919,42 +4919,48 @@ def test_object_copy_key_not_found():
 def test_object_copy_versioned_bucket():
     bucket = get_new_bucket()
     check_configure_versioning_retry(bucket, True, "Enabled")
-
     key = bucket.new_key('foo123bar')
-    _create_key_with_random_content(key.name, 1*1024*1024)
+    size = 1*1024*1024
+    data = str(bytearray(size))
+    key.set_contents_from_string(data)
 
     # copy object in the same bucket
     key2 = bucket.copy_key('bar321foo', bucket.name, key.name, src_version_id = key.version_id)
-    res = _make_request('GET', bucket, key2)
-    eq(res.status, 200)
-    eq(res.reason, 'OK')
+    key2 = bucket.get_key(key2.name)
+    eq(key2.size, size)
+    got = key2.get_contents_as_string()
+    eq(got, data)
 
     # second copy
     key3 = bucket.copy_key('bar321foo2', bucket.name, key2.name, src_version_id = key2.version_id)
-    res = _make_request('GET', bucket, key3)
-    eq(res.status, 200)
-    eq(res.reason, 'OK')
+    key3 = bucket.get_key(key3.name)
+    eq(key3.size, size)
+    got = key3.get_contents_as_string()
+    eq(got, data)
 
     # copy to another versioned bucket
     bucket2 = get_new_bucket()
     check_configure_versioning_retry(bucket2, True, "Enabled")
     key4 = bucket2.copy_key('bar321foo3', bucket.name, key.name, src_version_id = key.version_id)
-    res = _make_request('GET', bucket, key4)
-    eq(res.status, 200)
-    eq(res.reason, 'OK')
+    key4 = bucket2.get_key(key4.name)
+    eq(key4.size, size)
+    got = key4.get_contents_as_string()
+    eq(got, data)
 
     # copy to another non versioned bucket
     bucket3 = get_new_bucket()
     key5 = bucket3.copy_key('bar321foo4', bucket.name, key.name , src_version_id = key.version_id)
-    res = _make_request('GET', bucket, key5)
-    eq(res.status, 200)
-    eq(res.reason, 'OK')
+    key5 = bucket3.get_key(key5.name)
+    eq(key5.size, size)
+    got = key5.get_contents_as_string()
+    eq(got, data)
 
     # copy from a non versioned bucket
     key6 = bucket.copy_key('foo123bar2', bucket3.name, key5.name)
-    res = _make_request('GET', bucket, key6)
-    eq(res.status, 200)
-    eq(res.reason, 'OK')
+    key6 = bucket.get_key(key6.name)
+    eq(key6.size, size)
+    got = key6.get_contents_as_string()
+    eq(got, data)
 
 def transfer_part(bucket, mp_id, mp_keyname, i, part):
     """Transfer a part of a multipart upload. Designed to be run in parallel.