mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-15 06:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

[3.12] gh-111019: Align expected and actual titles in test output (GH-111020) (#111024)

Browse source 
gh-111019: Align expected and actual titles in test output (GH-111020)

Align expected and actual titles in output from
assert_has_calls/assert_called_with for greater readability
(cherry picked from commit 77dbd95609)

Co-authored-by: James <morisja@gmail.com>
This commit is contained in:
Miss Islington (bot) 2023-10-18 10:01:18 +02:00 • committed by GitHub
parent 004618fed7
commit 577a8fb72b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_unittest/testmock/testmock.py
View file

@ -1039,7 +1039,7 @@ class MockTest(unittest.TestCase):
actual = 'not called.' actual = 'not called.'
expected = "mock(1, '2', 3, bar='foo')" expected = "mock(1, '2', 3, bar='foo')"
message = 'expected call not found.\nExpected: %s\nActual: %s' message = 'expected call not found.\nExpected: %s\n Actual: %s'
self.assertRaisesWithMsg( self.assertRaisesWithMsg(
AssertionError, message % (expected, actual), AssertionError, message % (expected, actual),
mock.assert_called_with, 1, '2', 3, bar='foo' mock.assert_called_with, 1, '2', 3, bar='foo'
@ -1054,7 +1054,7 @@ class MockTest(unittest.TestCase):
for meth in asserters: for meth in asserters:
actual = "foo(1, '2', 3, foo='foo')" actual = "foo(1, '2', 3, foo='foo')"
expected = "foo(1, '2', 3, bar='foo')" expected = "foo(1, '2', 3, bar='foo')"
message = 'expected call not found.\nExpected: %s\nActual: %s' message = 'expected call not found.\nExpected: %s\n Actual: %s'
self.assertRaisesWithMsg( self.assertRaisesWithMsg(
AssertionError, message % (expected, actual), AssertionError, message % (expected, actual),
meth, 1, '2', 3, bar='foo' meth, 1, '2', 3, bar='foo'
@ -1064,7 +1064,7 @@ class MockTest(unittest.TestCase):
for meth in asserters: for meth in asserters:
actual = "foo(1, '2', 3, foo='foo')" actual = "foo(1, '2', 3, foo='foo')"
expected = "foo(bar='foo')" expected = "foo(bar='foo')"
message = 'expected call not found.\nExpected: %s\nActual: %s' message = 'expected call not found.\nExpected: %s\n Actual: %s'
self.assertRaisesWithMsg( self.assertRaisesWithMsg(
AssertionError, message % (expected, actual), AssertionError, message % (expected, actual),
meth, bar='foo' meth, bar='foo'
@ -1074,7 +1074,7 @@ class MockTest(unittest.TestCase):
for meth in asserters: for meth in asserters:
actual = "foo(1, '2', 3, foo='foo')" actual = "foo(1, '2', 3, foo='foo')"
expected = "foo(1, 2, 3)" expected = "foo(1, 2, 3)"
message = 'expected call not found.\nExpected: %s\nActual: %s' message = 'expected call not found.\nExpected: %s\n Actual: %s'
self.assertRaisesWithMsg( self.assertRaisesWithMsg(
AssertionError, message % (expected, actual), AssertionError, message % (expected, actual),
meth, 1, 2, 3 meth, 1, 2, 3
@ -1084,7 +1084,7 @@ class MockTest(unittest.TestCase):
for meth in asserters: for meth in asserters:
actual = "foo(1, '2', 3, foo='foo')" actual = "foo(1, '2', 3, foo='foo')"
expected = "foo()" expected = "foo()"
message = 'expected call not found.\nExpected: %s\nActual: %s' message = 'expected call not found.\nExpected: %s\n Actual: %s'
self.assertRaisesWithMsg( self.assertRaisesWithMsg(
AssertionError, message % (expected, actual), meth AssertionError, message % (expected, actual), meth
) )
@ -1533,7 +1533,7 @@ class MockTest(unittest.TestCase):
'^{}$'.format( '^{}$'.format(
re.escape('Calls not found.\n' re.escape('Calls not found.\n'
'Expected: [call()]\n' 'Expected: [call()]\n'
'Actual: [call(1)]'))) as cm: ' Actual: [call(1)]'))) as cm:
mock.assert_has_calls([call()]) mock.assert_has_calls([call()])
self.assertIsNone(cm.exception.__cause__) self.assertIsNone(cm.exception.__cause__)
@ -1545,7 +1545,7 @@ class MockTest(unittest.TestCase):
'Error processing expected calls.\n' 'Error processing expected calls.\n'
"Errors: [None, TypeError('too many positional arguments')]\n" "Errors: [None, TypeError('too many positional arguments')]\n"
"Expected: [call(), call(1, 2)]\n" "Expected: [call(), call(1, 2)]\n"
'Actual: [call(1)]'))) as cm: ' Actual: [call(1)]'))) as cm:
mock.assert_has_calls([call(), call(1, 2)]) mock.assert_has_calls([call(), call(1, 2)])
self.assertIsInstance(cm.exception.__cause__, TypeError) self.assertIsInstance(cm.exception.__cause__, TypeError)

6
Lib/unittest/mock.py
View file

@ -827,7 +827,7 @@ class NonCallableMock(Base):
def _format_mock_failure_message(self, args, kwargs, action='call'): def _format_mock_failure_message(self, args, kwargs, action='call'):
message = 'expected %s not found.\nExpected: %s\nActual: %s' message = 'expected %s not found.\nExpected: %s\n Actual: %s'
expected_string = self._format_mock_call_signature(args, kwargs) expected_string = self._format_mock_call_signature(args, kwargs)
call_args = self.call_args call_args = self.call_args
actual_string = self._format_mock_call_signature(*call_args) actual_string = self._format_mock_call_signature(*call_args)
@ -930,7 +930,7 @@ class NonCallableMock(Base):
if self.call_args is None: if self.call_args is None:
expected = self._format_mock_call_signature(args, kwargs) expected = self._format_mock_call_signature(args, kwargs)
actual = 'not called.' actual = 'not called.'
error_message = ('expected call not found.\nExpected: %s\nActual: %s' error_message = ('expected call not found.\nExpected: %s\n Actual: %s'
% (expected, actual)) % (expected, actual))
raise AssertionError(error_message) raise AssertionError(error_message)
@ -981,7 +981,7 @@ class NonCallableMock(Base):
raise AssertionError( raise AssertionError(
f'{problem}\n' f'{problem}\n'
f'Expected: {_CallList(calls)}' f'Expected: {_CallList(calls)}'
f'{self._calls_repr(prefix="Actual").rstrip(".")}' f'{self._calls_repr(prefix=" Actual").rstrip(".")}'
) from cause ) from cause
return return