From c5ba8c4e0f7fdd2ed7c4b3f866bc4645c40f61c6 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sun, 14 Jun 2015 21:31:30 -0700 Subject: [PATCH] tests must have unique names, otherwise they override existing tests. Signed-off-by: Robin H. Johnson --- s3tests/functional/test_headers.py | 4 ++-- s3tests/fuzz/test/test_fuzzer.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/s3tests/functional/test_headers.py b/s3tests/functional/test_headers.py index 6d404d2..8fd42d3 100644 --- a/s3tests/functional/test_headers.py +++ b/s3tests/functional/test_headers.py @@ -167,7 +167,7 @@ def _setup_bad_object(headers=None, remove=None): @attr(operation='create w/invalid MD5') @attr(assertion='fails 400') @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'}) 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(assertion='fails 400') @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='}) e = assert_raises(boto.exception.S3ResponseError, key.set_contents_from_string, 'bar') diff --git a/s3tests/fuzz/test/test_fuzzer.py b/s3tests/fuzz/test/test_fuzzer.py index f54e954..5759019 100644 --- a/s3tests/fuzz/test/test_fuzzer.py +++ b/s3tests/fuzz/test/test_fuzzer.py @@ -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])) -def test_expand_random_binary(): +def test_expand_random_binary_no_whitespace(): prng = random.Random(1) for _ in xrange(1000): got = expand({}, '{random 500 binary_no_whitespace}', prng)