openstack/swift
Code Issues Proposed changes

Merge "Fix intermittent failure in test_POST_but_expired"

Browse Source
This commit is contained in:
Jenkins 2017-08-07 07:16:45 +00:00 committed by Gerrit Code Review
commit 53defc8b9e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/obj/test_server.py
View File

@ -5874,7 +5874,7 @@ class TestObjectController(unittest.TestCase):
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertEqual(resp.status_int, 202) self.assertEqual(resp.status_int, 202)
delete_at_timestamp = int(time() + 1) delete_at_timestamp = int(time() + 2)
delete_at_container = str( delete_at_container = str(
delete_at_timestamp / delete_at_timestamp /
self.object_controller.expiring_objects_container_divisor * self.object_controller.expiring_objects_container_divisor *
@ -5892,7 +5892,7 @@ class TestObjectController(unittest.TestCase):
orig_time = object_server.time.time orig_time = object_server.time.time
try: try:
t = time() + 2 t = time() + 3
object_server.time.time = lambda: t object_server.time.time = lambda: t
req = Request.blank( req = Request.blank(
'/sda1/p/a/c/o', '/sda1/p/a/c/o',