openstack/python-swiftclient
Code Issues Proposed changes

Fix intermittent fail of test_delete_account

Browse Source 
The test asserts calls made in specific order,
but they are made from threads so may be in
different order.

Change-Id: I1b6e7303fe0e6fb2afc7da3462b891feab90bc17
Closes-Bug: #1539536
This commit is contained in:
Alistair Coles 2016-01-29 11:16:37 +00:00
parent 0fe02eb1c0
commit 14a0447491
1 changed files with 10 additions and 8 deletions

18
tests/unit/test_shell.py

@ -734,14 +734,16 @@ class TestShell(testtools.TestCase):
argv = ["", "delete", "--all"] argv = ["", "delete", "--all"]
connection.return_value.head_object.return_value = {} connection.return_value.head_object.return_value = {}
swiftclient.shell.main(argv) swiftclient.shell.main(argv)
self.assertEqual( connection.return_value.delete_object.assert_has_calls([
connection.return_value.delete_object.mock_calls, [ mock.call('container', 'object', query_string=None,
mock.call('container', 'object', query_string=None, response_dict={}),
response_dict={}), mock.call('container', 'obj\xe9ct2', query_string=None,
mock.call('container', 'obj\xe9ct2', query_string=None, response_dict={}),
response_dict={}), mock.call('container2', 'object', query_string=None,
mock.call('container2', 'object', query_string=None, response_dict={})], any_order=True)
response_dict={})]) self.assertEqual(3, connection.return_value.delete_object.call_count,
'Expected 3 calls but found\n%r'
% connection.return_value.delete_object.mock_calls)
self.assertEqual( self.assertEqual(
connection.return_value.delete_container.mock_calls, [ connection.return_value.delete_container.mock_calls, [
mock.call('container', response_dict={}), mock.call('container', response_dict={}),