diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-09-17 11:35:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 11:35:56 (GMT) |
| commit | f668d2b775da4bcd07e142c4bc5ebd88165fadf4 (patch) | |
| tree | d9abc9d44d2277ad579cd24d7259a24137c9dd0f | |
| parent | 728bea60e5ff2bea36f8f9a3cafe6b96e452c211 (diff) | |
| download | cpython-f668d2b775da4bcd07e142c4bc5ebd88165fadf4.zip cpython-f668d2b775da4bcd07e142c4bc5ebd88165fadf4.tar.gz cpython-f668d2b775da4bcd07e142c4bc5ebd88165fadf4.tar.bz2 | |
bpo-37828: Fix default mock_name in unittest.mock.assert_called error (GH-16166)
In the format string for assert_called the evaluation order is incorrect and hence for mock's without name, 'None' is printed whereas it should be 'mock' like for other messages. The error message is ("Expected '%s' to have been called." % self._mock_name or 'mock').
(cherry picked from commit 5f5f11faf9de0d8dcbe1a8a4eb35d2a4232d6eaa)
Co-authored-by: Abraham Toriz Cruz <awonderfulcode@gmail.com>
| -rw-r--r-- | Lib/unittest/mock.py | 2 | ||||
| -rw-r--r-- | Lib/unittest/test/testmock/testmock.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-09-15-21-31-18.bpo-37828.gLLDX7.rst | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 497aa6f..9fd5c3c 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -873,7 +873,7 @@ class NonCallableMock(Base): """ if self.call_count == 0: msg = ("Expected '%s' to have been called." % - self._mock_name or 'mock') + (self._mock_name or 'mock')) raise AssertionError(msg) def assert_called_once(self): diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py index 413ee68..2847d65 100644 --- a/Lib/unittest/test/testmock/testmock.py +++ b/Lib/unittest/test/testmock/testmock.py @@ -388,6 +388,14 @@ class MockTest(unittest.TestCase): _check(mock) + def test_assert_called_exception_message(self): + msg = "Expected '{0}' to have been called" + with self.assertRaisesRegex(AssertionError, msg.format('mock')): + Mock().assert_called() + with self.assertRaisesRegex(AssertionError, msg.format('test_name')): + Mock(name="test_name").assert_called() + + def test_assert_called_once_with(self): mock = Mock() mock() diff --git a/Misc/NEWS.d/next/Library/2019-09-15-21-31-18.bpo-37828.gLLDX7.rst b/Misc/NEWS.d/next/Library/2019-09-15-21-31-18.bpo-37828.gLLDX7.rst new file mode 100644 index 0000000..c364009 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-09-15-21-31-18.bpo-37828.gLLDX7.rst @@ -0,0 +1,2 @@ +Fix default mock name in :meth:`unittest.mock.Mock.assert_called` exceptions. +Patch by Abraham Toriz Cruz. |