openstack/python-swiftclient
Code Issues Proposed changes

tests: Fix call assertion

Browse Source 
Under py312, MagicMock.has_calls raises an AttributeError. This is
actually a good thing, as previously we weren't actually making the
assertions we thought we were making.

Fix the one place that we forgot the leading `assert_`, and switch it
to `any_order=True`; this is required for the test to pass, as there
are additional calls between the two expected calls.

See https://github.com/python/cpython/commit/1d4d677d

Change-Id: Ia2ff2f198b4c1312a3e7dce32f11b87050683d45
This commit is contained in:
Tim Burke 2023-12-15 12:18:18 -08:00
parent 44f11384ff
commit 6f01f84ce2
1 changed files with 4 additions and 3 deletions

7
test/unit/test_shell.py

@ -867,12 +867,13 @@ class TestShell(unittest.TestCase):
fh.write(b'12345678901234567890')
swiftclient.shell.main(argv)
expected_calls = [mock.call('container',
{'X-Storage-Policy': mock.ANY},
{'X-Storage-Policy': 'one'},
response_dict={}),
mock.call('container_segments',
{'X-Storage-Policy': mock.ANY},
{'X-Storage-Policy': 'one'},
response_dict={})]
connection.return_value.put_container.has_calls(expected_calls)
connection.return_value.put_container.assert_has_calls(expected_calls,
any_order=True)
connection.return_value.put_object.assert_called_with(
'container',
self.tmpfile.lstrip('/'),