diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-01 19:19:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-01 19:19:46 +0000 |
| commit | da27ad11ccb72664bd8a13c166ab8965438a9cdc (patch) | |
| tree | 68dc0110dd2503ce73c195da5b93b9de60d6ce13 | |
| parent | fee68f732450a1ce8add565dacabbf74d5c82c09 (diff) | |
| parent | 14a0447491aa1693b8ca5ef36ab69bed5d44a1e6 (diff) | |
| download | python-swiftclient-da27ad11ccb72664bd8a13c166ab8965438a9cdc.tar.gz | |
Merge "Fix intermittent fail of test_delete_account"
| -rw-r--r-- | tests/unit/test_shell.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/unit/test_shell.py b/tests/unit/test_shell.py index 08d4d7c..00546f6 100644 --- a/tests/unit/test_shell.py +++ b/tests/unit/test_shell.py @@ -751,14 +751,16 @@ class TestShell(testtools.TestCase): argv = ["", "delete", "--all"] connection.return_value.head_object.return_value = {} swiftclient.shell.main(argv) - self.assertEqual( - connection.return_value.delete_object.mock_calls, [ - mock.call('container', 'object', query_string=None, - response_dict={}), - mock.call('container', 'obj\xe9ct2', query_string=None, - response_dict={}), - mock.call('container2', 'object', query_string=None, - response_dict={})]) + connection.return_value.delete_object.assert_has_calls([ + mock.call('container', 'object', query_string=None, + response_dict={}), + mock.call('container', 'obj\xe9ct2', query_string=None, + response_dict={}), + mock.call('container2', 'object', query_string=None, + response_dict={})], any_order=True) + 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( connection.return_value.delete_container.mock_calls, [ mock.call('container', response_dict={}), |