summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/test/testmock
diff options
context:
space:
mode:
authorAbraham Toriz Cruz <awonderfulcode@gmail.com>2019-09-17 11:16:08 (GMT)
committerPablo Galindo <Pablogsal@gmail.com>2019-09-17 11:16:08 (GMT)
commit5f5f11faf9de0d8dcbe1a8a4eb35d2a4232d6eaa (patch)
tree18cdf4ee14ec18b596aa1ea5f6fb4ad60bccc508 /Lib/unittest/test/testmock
parent219fb9d65ef7e5363eccc9dde0988bb085db1c86 (diff)
downloadcpython-5f5f11faf9de0d8dcbe1a8a4eb35d2a4232d6eaa.zip
cpython-5f5f11faf9de0d8dcbe1a8a4eb35d2a4232d6eaa.tar.gz
cpython-5f5f11faf9de0d8dcbe1a8a4eb35d2a4232d6eaa.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').
Diffstat (limited to 'Lib/unittest/test/testmock')
-rw-r--r--Lib/unittest/test/testmock/testmock.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
index 581afaa..2bafa82 100644
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -396,6 +396,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()