openstack/python-swiftclient
Code Issues Proposed changes

Fix intermittent test failure

Browse Source 
The mock needs to be initialized before calling main, or we get a race
to create it between all the uu_threads

Change-Id: If7649da13ed9276d7f0e005e999770e09c022a3f
This commit is contained in:
Tim Burke
2016-08-26 18:19:19 -07:00
parent 20e0c515bf
commit 209677e6a8
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/unit/test_shell.py
View File

@@ -1328,8 +1328,8 @@ class TestShell(unittest.TestCase):
fresh_metadata=False, headers={'X-Object-Meta-Color': 'Blue'},
response_dict={})
]
for call in calls:
self.assertIn(call, connection.return_value.copy_object.mock_calls)
connection.return_value.copy_object.assert_has_calls(
calls, any_order=True)
self.assertEqual(len(connection.return_value.copy_object.mock_calls),
len(calls))
@@ -1337,6 +1337,7 @@ class TestShell(unittest.TestCase):
def test_copy_two_objects_destination(self, connection):
argv = ["", "copy", "container", "object", "object2",
"--meta", "Color:Blue", "--destination", "/c"]
connection.return_value.copy_object.return_value = None
swiftclient.shell.main(argv)
calls = [
mock.call(
@@ -1348,7 +1349,10 @@ class TestShell(unittest.TestCase):
fresh_metadata=False, headers={'X-Object-Meta-Color': 'Blue'},
response_dict={})
]
connection.return_value.copy_object.assert_has_calls(calls)
connection.return_value.copy_object.assert_has_calls(
calls, any_order=True)
self.assertEqual(len(connection.return_value.copy_object.mock_calls),
len(calls))
@mock.patch('swiftclient.service.Connection')
def test_copy_two_objects_bad_destination(self, connection):