openstack/python-swiftclient
Code Issues Proposed changes

Merge "Fix intermittent test failure"

Browse Source
This commit is contained in:
Jenkins 2016-09-14 20:46:57 +00:00 committed by Gerrit Code Review
commit 714bf0cd4b
1 changed files with 7 additions and 3 deletions
Show Stats 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'}, fresh_metadata=False, headers={'X-Object-Meta-Color': 'Blue'},
response_dict={}) response_dict={})
] ]
for call in calls: connection.return_value.copy_object.assert_has_calls(
self.assertIn(call, connection.return_value.copy_object.mock_calls) calls, any_order=True)
self.assertEqual(len(connection.return_value.copy_object.mock_calls), self.assertEqual(len(connection.return_value.copy_object.mock_calls),
len(calls)) len(calls))
@ -1337,6 +1337,7 @@ class TestShell(unittest.TestCase):
def test_copy_two_objects_destination(self, connection): def test_copy_two_objects_destination(self, connection):
argv = ["", "copy", "container", "object", "object2", argv = ["", "copy", "container", "object", "object2",
"--meta", "Color:Blue", "--destination", "/c"] "--meta", "Color:Blue", "--destination", "/c"]
connection.return_value.copy_object.return_value = None
swiftclient.shell.main(argv) swiftclient.shell.main(argv)
calls = [ calls = [
mock.call( mock.call(
@ -1348,7 +1349,10 @@ class TestShell(unittest.TestCase):
fresh_metadata=False, headers={'X-Object-Meta-Color': 'Blue'}, fresh_metadata=False, headers={'X-Object-Meta-Color': 'Blue'},
response_dict={}) 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') @mock.patch('swiftclient.service.Connection')
def test_copy_two_objects_bad_destination(self, connection): def test_copy_two_objects_bad_destination(self, connection):