openstack/deb-python-swiftclient
Code Issues Proposed changes

Merge "Fix intermittent fail of test_delete_account"

Browse Source
This commit is contained in:
Jenkins
2016-02-01 19:19:46 +00:00
committed by Gerrit Code Review
parent fee68f7324 14a0447491
commit da27ad11cc
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/unit/test_shell.py
View File

@@ -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={}),