From af1529053c1d1d84c783420bab7cc797b22b764d Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Fri, 24 May 2019 12:44:19 -0400 Subject: [PATCH] boto2: rm functional.test_s3.test_lifecycle_rules_conflict The assumption that there may be only one rule per prefix has been removed. The rules specifically tested here--without tag filters--do overlap but are not in conflict. I am proposing to remove altogether rather than writing new deconfliction logic. Signed-off-by: Matt Benjamin Signed-off-by: Ali Maredia --- s3tests/functional/test_s3.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py index e4d41f6..37716c3 100644 --- a/s3tests/functional/test_s3.py +++ b/s3tests/functional/test_s3.py @@ -7775,21 +7775,6 @@ def test_lifecycle_invalid_status(): eq(e.status, 400) eq(e.error_code, 'MalformedXML') -@attr(resource='bucket') -@attr(method='put') -@attr(operation='rules conflicted in lifecycle') -@attr('lifecycle') -@attr(assertion='fails 400') -def test_lifecycle_rules_conflicted(): - bucket = get_new_bucket() - lifecycle = create_lifecycle(rules=[{'id': 'rule1', 'days': 2, 'prefix': 'test1/', 'status': 'Enabled'}, - {'id': 'rule2', 'days': 3, 'prefix': 'test3/', 'status': 'Enabled'}, - {'id': 'rule3', 'days': 5, 'prefix': 'test1/abc', 'status': 'Enabled'}]) - e = assert_raises(boto.exception.S3ResponseError, bucket.configure_lifecycle, lifecycle) - eq(e.status, 400) - eq(e.error_code, 'InvalidRequest') - - def generate_lifecycle_body(rules): body = '' for rule in rules: