dkirillov/s3-tests
1
0
Fork 0
forked from TrueCloudLab/s3-tests
Code Pull requests Activity

Modified aws kms tests to use config variable kms_keyid

Browse source 
Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
(cherry picked from commit 05543b85b1)
This commit is contained in:
Adam Kupczyk 2016-12-15 11:09:36 +01:00 committed by Casey Bodley
parent bad1554d09
commit e263fdb004
2 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
s3tests/functional/__init__.py
View file

@ -310,6 +310,7 @@ def setup():
'user_id', 'user_id',
'display_name', 'display_name',
'email', 'email',
'kms_keyid',
]: ]:
try: try:
config[name][var] = cfg.get(section, var) config[name][var] = cfg.get(section, var)

37
s3tests/functional/test_s3.py
View file

@ -7753,14 +7753,15 @@ def test_sse_kms_post_object_authenticated_request():
got = key.get_contents_as_string(headers=get_headers) got = key.get_contents_as_string(headers=get_headers)
eq(got, 'bar') eq(got, 'bar')
keyid = "d8f40c6d-1c2c-4314-b435-4ef445c6971f"
@attr(resource='object') @attr(resource='object')
@attr(method='put') @attr(method='put')
@attr(operation='Test SSE-KMS encrypted transfer 1 byte') @attr(operation='Test SSE-KMS encrypted transfer 1 byte')
@attr(assertion='success') @attr(assertion='success')
@attr('encryption') @attr('encryption')
def test_sse_kms_barb_transfer_1b(): def test_sse_kms_barb_transfer_1b():
_test_sse_kms_customer_write(48, key_id = keyid) if 'kms_keyid' not in config['main']:
raise SkipTest
_test_sse_kms_customer_write(1, key_id = config['main']['kms_keyid'])
@attr(resource='object') @attr(resource='object')
@ -7769,7 +7770,9 @@ def test_sse_kms_barb_transfer_1b():
@attr(assertion='success') @attr(assertion='success')
@attr('encryption') @attr('encryption')
def test_sse_kms_barb_transfer_1kb(): def test_sse_kms_barb_transfer_1kb():
_test_sse_kms_customer_write(1024, key_id = keyid) if 'kms_keyid' not in config['main']:
raise SkipTest
_test_sse_kms_customer_write(1024, key_id = config['main']['kms_keyid'])
@attr(resource='object') @attr(resource='object')
@ -7778,7 +7781,9 @@ def test_sse_kms_barb_transfer_1kb():
@attr(assertion='success') @attr(assertion='success')
@attr('encryption') @attr('encryption')
def test_sse_kms_barb_transfer_1MB(): def test_sse_kms_barb_transfer_1MB():
_test_sse_kms_customer_write(1024*1024, key_id = keyid) if 'kms_keyid' not in config['main']:
raise SkipTest
_test_sse_kms_customer_write(1024*1024, key_id = config['main']['kms_keyid'])
@attr(resource='object') @attr(resource='object')
@ -7787,24 +7792,6 @@ def test_sse_kms_barb_transfer_1MB():
@attr(assertion='success') @attr(assertion='success')
@attr('encryption') @attr('encryption')
def test_sse_kms_barb_transfer_13b(): def test_sse_kms_barb_transfer_13b():
_test_sse_kms_customer_write(13, key_id = keyid) if 'kms_keyid' not in config['main']:
raise SkipTest
_test_sse_kms_customer_write(13, key_id = config['main']['kms_keyid'])
@attr(resource='object')
@attr(method='put')
@attr(operation='data write from file (w/100-Continue)')
@attr(assertion='succeeds and returns written data')
@attr('stress')
def test_object_write_file_prrr():
# boto Key.set_contents_from_file / .send_file uses Expect:
# 100-Continue, so this test exercises that (though a bit too
# subtly)
bucket = get_new_bucket()
for rozmiar in range(1,1000,1):
key = bucket.new_key('plikus')
data = StringIO('bar')
dataarr = [random.randint(0,255) for _ in xrange(rozmiar)]
data = "".join( chr( val ) for val in dataarr )
key.set_contents_from_string(data)
got = key.get_contents_as_string()
eq(got, data)