From 90ab37f1c51c087b5ca7b0e5f0ce58cf140c79b7 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 28 Feb 2017 16:58:17 -0500 Subject: [PATCH] crypto: add key headers to valid HEAD requests Signed-off-by: Casey Bodley (cherry picked from commit e49cf3ddab75d90525e6b07bf53acf2d8eabd497) --- s3tests/functional/test_s3.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py index a7573e1..76f4523 100644 --- a/s3tests/functional/test_s3.py +++ b/s3tests/functional/test_s3.py @@ -7359,7 +7359,7 @@ def test_encryption_sse_c_multipart_upload(): eq(result.get('x-rgw-object-count', 1), 1) eq(result.get('x-rgw-bytes-used', 30 * 1024 * 1024), 30 * 1024 * 1024) - k = bucket.get_key(key) + k = bucket.get_key(key, headers=enc_headers) eq(k.metadata['foo'], 'bar') eq(k.content_type, content_type) test_string = k.get_contents_as_string(headers=enc_headers) @@ -7458,7 +7458,7 @@ def test_encryption_sse_c_multipart_bad_download(): eq(result.get('x-rgw-object-count', 1), 1) eq(result.get('x-rgw-bytes-used', 30 * 1024 * 1024), 30 * 1024 * 1024) - k = bucket.get_key(key) + k = bucket.get_key(key, headers=put_headers) eq(k.metadata['foo'], 'bar') eq(k.content_type, content_type) e = assert_raises(boto.exception.S3ResponseError, @@ -7512,7 +7512,7 @@ def test_encryption_sse_c_post_object_authenticated_request(): 'x-amz-server-side-encryption-customer-key-md5': 'DWygnHRtgiJ77HCm+1rvHw==' } - key = bucket.get_key("foo.txt") + key = bucket.get_key("foo.txt", headers=get_headers) got = key.get_contents_as_string(headers=get_headers) eq(got, 'bar')