Merge pull request #168 from zhangsw/lifecycle-expiration

modify the thread sleep time in lifecycle expiration test so that it can pass on ceph master branch.

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
This commit is contained in:
Yehuda Sadeh 2017-07-07 13:58:55 -07:00 committed by GitHub
commit d801534f99

View file

@ -7501,13 +7501,13 @@ def test_lifecycle_expiration():
# Get list of all keys # Get list of all keys
init_keys = bucket.get_all_keys() init_keys = bucket.get_all_keys()
# Wait for first expiration (plus fudge to handle the timer window) # Wait for first expiration (plus fudge to handle the timer window)
time.sleep(35) time.sleep(6)
expire1_keys = bucket.get_all_keys() expire1_keys = bucket.get_all_keys()
# Wait for next expiration cycle # Wait for next expiration cycle
time.sleep(15) time.sleep(2)
keep2_keys = bucket.get_all_keys() keep2_keys = bucket.get_all_keys()
# Wait for final expiration cycle # Wait for final expiration cycle
time.sleep(25) time.sleep(8)
expire3_keys = bucket.get_all_keys() expire3_keys = bucket.get_all_keys()
eq(len(init_keys), 6) eq(len(init_keys), 6)