mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-25 12:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-36871: Avoid duplicated 'Actual:' in assertion message (GH-16361)

Browse source 
Fixes an issue caught after merge of PR 16005.

Tightened test assertions to check the entire assertion message.
This commit is contained in:
Samuel Freilich 2019-09-24 18:04:29 -04:00 • committed by Gregory P. Smith
parent b5a7a4f0c2
commit 2180f6b058
3 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/unittest/mock.py
View file

@ -939,8 +939,8 @@ class NonCallableMock(Base):
for e in expected]) for e in expected])
raise AssertionError( raise AssertionError(
f'{problem}\n' f'{problem}\n'
f'Expected: {_CallList(calls)}\n' f'Expected: {_CallList(calls)}'
f'Actual: {self._calls_repr(prefix="Actual")}' f'{self._calls_repr(prefix="Actual").rstrip(".")}'
) from cause ) from cause
return return

21
Lib/unittest/test/testmock/testasync.py
View file

@ -892,21 +892,28 @@ class AsyncMockAssert(unittest.TestCase):
self.mock.assert_not_awaited() self.mock.assert_not_awaited()
def test_assert_has_awaits_not_matching_spec_error(self): def test_assert_has_awaits_not_matching_spec_error(self):
async def f(): pass async def f(x=None): pass
mock = AsyncMock(spec=f) self.mock = AsyncMock(spec=f)
asyncio.run(self._runnable_test(1))
with self.assertRaisesRegex( with self.assertRaisesRegex(
AssertionError, AssertionError,
re.escape('Awaits not found.\nExpected:')) as cm: '^{}$'.format(
mock.assert_has_awaits([call()]) re.escape('Awaits not found.\n'
'Expected: [call()]\n'
'Actual: [call(1)]'))) as cm:
self.mock.assert_has_awaits([call()])
self.assertIsNone(cm.exception.__cause__) self.assertIsNone(cm.exception.__cause__)
with self.assertRaisesRegex( with self.assertRaisesRegex(
AssertionError, AssertionError,
re.escape('Error processing expected awaits.\n' '^{}$'.format(
re.escape(
'Error processing expected awaits.\n'
"Errors: [None, TypeError('too many positional " "Errors: [None, TypeError('too many positional "
"arguments')]\n" "arguments')]\n"
'Expected:')) as cm: 'Expected: [call(), call(1, 2)]\n'
mock.assert_has_awaits([call(), call('wrong')]) 'Actual: [call(1)]'))) as cm:
self.mock.assert_has_awaits([call(), call(1, 2)])
self.assertIsInstance(cm.exception.__cause__, TypeError) self.assertIsInstance(cm.exception.__cause__, TypeError)

21
Lib/unittest/test/testmock/testmock.py
View file

@ -1436,23 +1436,30 @@ class MockTest(unittest.TestCase):
mock.assert_has_calls(calls[:-1], any_order=True) mock.assert_has_calls(calls[:-1], any_order=True)
def test_assert_has_calls_not_matching_spec_error(self): def test_assert_has_calls_not_matching_spec_error(self):
def f(): pass def f(x=None): pass
mock = Mock(spec=f) mock = Mock(spec=f)
mock(1)
with self.assertRaisesRegex( with self.assertRaisesRegex(
AssertionError, AssertionError,
re.escape('Calls not found.\nExpected:')) as cm: '^{}$'.format(
re.escape('Calls not found.\n'
'Expected: [call()]\n'
'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__)
with self.assertRaisesRegex( with self.assertRaisesRegex(
AssertionError, AssertionError,
re.escape('Error processing expected calls.\n' '^{}$'.format(
"Errors: [None, TypeError('too many positional " re.escape(
"arguments')]\n" 'Error processing expected calls.\n'
'Expected:')) as cm: "Errors: [None, TypeError('too many positional arguments')]\n"
mock.assert_has_calls([call(), call('wrong')]) "Expected: [call(), call(1, 2)]\n"
'Actual: [call(1)]'))) as cm:
mock.assert_has_calls([call(), call(1, 2)])
self.assertIsInstance(cm.exception.__cause__, TypeError) self.assertIsInstance(cm.exception.__cause__, TypeError)
def test_assert_any_call(self): def test_assert_any_call(self):