openstack/swift
Code Issues Proposed changes

Merge "Fix race in test_server.TestObjectController.test_PUT_ssync_multi_frag"

Browse Source
This commit is contained in:
Jenkins 2015-07-09 20:02:17 +00:00 committed by Gerrit Code Review
commit 49e7c25876
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1267,8 +1267,9 @@ class TestObjectController(unittest.TestCase):
object_server.http_connect = old_http_connect object_server.http_connect = old_http_connect
def test_PUT_ssync_multi_frag(self): def test_PUT_ssync_multi_frag(self):
timestamp = utils.Timestamp(time()).internal
def put_with_index(expected_rsp, frag_index, node_index=None): def put_with_index(expected_rsp, frag_index, node_index=None):
timestamp = utils.Timestamp(int(time())).internal
data_file_tail = '#%d.data' % frag_index data_file_tail = '#%d.data' % frag_index
headers = {'X-Timestamp': timestamp, headers = {'X-Timestamp': timestamp,
'Content-Length': '6', 'Content-Length': '6',