mirror of
https://github.com/ceph/s3-tests.git
synced 2024-11-28 19:31:39 +00:00
fix/restore test_lifecycle_expiration checks
Commit bf956df71e
adding
listobvjectsv2 tests inadvertently changed the v1
test_lifecycle_expiration test, which it had copied to
create a v2 version. Revert this.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
This commit is contained in:
parent
34040769ff
commit
8ca96c4519
1 changed files with 3 additions and 5 deletions
|
@ -8938,9 +8938,9 @@ def test_lifecycle_expiration():
|
||||||
expire3_objects = response['Contents']
|
expire3_objects = response['Contents']
|
||||||
|
|
||||||
eq(len(init_objects), 6)
|
eq(len(init_objects), 6)
|
||||||
eq(len(expire1_objects), 6)
|
eq(len(expire1_objects), 4)
|
||||||
eq(len(keep2_objects), 6)
|
eq(len(keep2_objects), 4)
|
||||||
eq(len(expire3_objects), 6)
|
eq(len(expire3_objects), 2)
|
||||||
|
|
||||||
@attr(resource='bucket')
|
@attr(resource='bucket')
|
||||||
@attr(method='put')
|
@attr(method='put')
|
||||||
|
@ -8977,7 +8977,6 @@ def test_lifecyclev2_expiration():
|
||||||
eq(len(keep2_objects), 4)
|
eq(len(keep2_objects), 4)
|
||||||
eq(len(expire3_objects), 2)
|
eq(len(expire3_objects), 2)
|
||||||
|
|
||||||
|
|
||||||
@attr(resource='bucket')
|
@attr(resource='bucket')
|
||||||
@attr(method='put')
|
@attr(method='put')
|
||||||
@attr(operation='test lifecycle expiration on versining enabled bucket')
|
@attr(operation='test lifecycle expiration on versining enabled bucket')
|
||||||
|
@ -9002,7 +9001,6 @@ def test_lifecycle_expiration_versioning_enabled():
|
||||||
eq(len(versions), 1)
|
eq(len(versions), 1)
|
||||||
eq(len(delete_markers), 1)
|
eq(len(delete_markers), 1)
|
||||||
|
|
||||||
|
|
||||||
@attr(resource='bucket')
|
@attr(resource='bucket')
|
||||||
@attr(method='put')
|
@attr(method='put')
|
||||||
@attr(operation='id too long in lifecycle rule')
|
@attr(operation='id too long in lifecycle rule')
|
||||||
|
|
Loading…
Reference in a new issue