TrueCloudLab/s3-tests
7
0
Fork 1
mirror of https://github.com/ceph/s3-tests.git synced 2024-11-22 09:29:43 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity

Merge pull request #58 from robbat2/wip-unique-testname

Browse source 
tests must have unique names, otherwise they override existing tests.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2015-06-17 13:31:30 -07:00
commit 226f5eb507
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
s3tests/functional/test_headers.py
View file

@ -167,7 +167,7 @@ def _setup_bad_object(headers=None, remove=None):
@attr(operation='create w/invalid MD5') @attr(operation='create w/invalid MD5')
@attr(assertion='fails 400') @attr(assertion='fails 400')
@nose.with_setup(teardown=_clear_custom_headers) @nose.with_setup(teardown=_clear_custom_headers)
def test_object_create_bad_md5_invalid(): def test_object_create_bad_md5_invalid_garbage():
key = _setup_bad_object({'Content-MD5':'AWS HAHAHA'}) key = _setup_bad_object({'Content-MD5':'AWS HAHAHA'})
e = assert_raises(boto.exception.S3ResponseError, key.set_contents_from_string, 'bar') e = assert_raises(boto.exception.S3ResponseError, key.set_contents_from_string, 'bar')
@ -181,7 +181,7 @@ def test_object_create_bad_md5_invalid():
@attr(operation='create w/invalid MD5') @attr(operation='create w/invalid MD5')
@attr(assertion='fails 400') @attr(assertion='fails 400')
@nose.with_setup(teardown=_clear_custom_headers) @nose.with_setup(teardown=_clear_custom_headers)
def test_object_create_bad_md5_invalid(): def test_object_create_bad_md5_invalid_short():
key = _setup_bad_object({'Content-MD5':'YWJyYWNhZGFicmE='}) key = _setup_bad_object({'Content-MD5':'YWJyYWNhZGFicmE='})
e = assert_raises(boto.exception.S3ResponseError, key.set_contents_from_string, 'bar') e = assert_raises(boto.exception.S3ResponseError, key.set_contents_from_string, 'bar')

2
s3tests/fuzz/test/test_fuzzer.py
View file

@ -178,7 +178,7 @@ def test_expand_random_printable_no_whitespace():
assert_true(reduce(lambda x, y: x and y, [x not in string.whitespace and x in string.printable for x in got])) assert_true(reduce(lambda x, y: x and y, [x not in string.whitespace and x in string.printable for x in got]))
def test_expand_random_binary(): def test_expand_random_binary_no_whitespace():
prng = random.Random(1) prng = random.Random(1)
for _ in xrange(1000): for _ in xrange(1000):
got = expand({}, '{random 500 binary_no_whitespace}', prng) got = expand({}, '{random 500 binary_no_whitespace}', prng)