Added tests to show that names from denylist still can be used with a…

… spec
cjw296 · Jan 6, 2023 · Jan 3, 2023 · Jan 5, 2023 · Jan 5, 2023 · Jan 6, 2023
commit 2bd97a17b535de645c873c0f2553aad91a28767f
@@ -1647,14 +1647,32 @@ def test_mock_unsafe(self):
             m.assrt_foo_call()
         with self.assertRaisesRegex(AttributeError, msg):
             m.called_once_with()
+        with self.assertRaisesRegex(AttributeError, msg):
+            m.called_once()
         with self.assertRaisesRegex(AttributeError, msg):
             m.has_calls()
+
+        class Foo(object):
+            def called_once(self):
+                pass
+
+            def has_calls(self):
+                pass
+
+        m = Mock(spec=Foo)
+        m.called_once()
+        m.has_calls()
+
+        m.called_once.assert_called_once()
+        m.has_calls.assert_called_once()
+
         m = Mock(unsafe=True)
         m.assert_foo_call()
         m.assret_foo_call()
         m.asert_foo_call()
         m.aseert_foo_call()
         m.assrt_foo_call()
+        m.called_once()
         m.called_once_with()
         m.has_calls()
 

@@ -1235,9 +1235,9 @@ class or instance) that acts as the specification for the mock object. If
       `return_value` attribute.
 
     * `unsafe`: By default, accessing any attribute whose name starts with
-      *assert*, *assret*, *asert*, *aseert*, *assrt*, or *called_* will raise an
-       AttributeError. Passing `unsafe=True` will allow access to
-      these attributes.
+      *assert*, *assret*, *asert*, *aseert*, *assrt*, or an attribute name that matches
+      an assertion method without the prefix *assert_* will raise an
+      AttributeError. Passing `unsafe=True` will allow access to these attributes.
 
     * `wraps`: Item for the mock object to wrap. If `wraps` is not None then
       calling the Mock will pass the call through to the wrapped object

diff --git a/Misc/NEWS.d/next/Library/2023-01-02-16-59-49.gh-issue-100690.2EgWPS.rst b/Misc/NEWS.d/next/Library/2023-01-02-16-59-49.gh-issue-100690.2EgWPS.rst
@@ -1,3 +1,3 @@
 Mock objects which are not unsafe will now raise an AttributeError if an
-attribute with the prefix ``called_`` is accessed, in addition to this already
-happening for the prefixes assert, assret, asert, aseert, assrt.
+attribute that matches the name of an existing assertion is accessed, e.g. ``called_once`` instead of ``assert_called_once``.
+This is in addition to this already happening for accessing attributes with prefixes assert, assret, asert, aseert, and assrt.