changeset:   104341:4e39b4e57673
branch:      3.6
parent:      104339:b88be2133323
user:        Gregory P. Smith <greg@krypto.org>
date:        Thu Oct 06 14:31:23 2016 -0700
files:       Lib/unittest/mock.py Lib/unittest/test/testmock/testpatch.py Misc/NEWS
description:
Fixes issue28380: unittest.mock Mock autospec functions now properly support
assert_called, assert_not_called, and assert_called_once.


diff -r b88be2133323 -r 4e39b4e57673 Lib/unittest/mock.py
--- a/Lib/unittest/mock.py	Thu Oct 06 14:05:42 2016 -0400
+++ b/Lib/unittest/mock.py	Thu Oct 06 14:31:23 2016 -0700
@@ -193,6 +193,12 @@
 
     def assert_called_with(*args, **kwargs):
         return mock.assert_called_with(*args, **kwargs)
+    def assert_called(*args, **kwargs):
+        return mock.assert_called(*args, **kwargs)
+    def assert_not_called(*args, **kwargs):
+        return mock.assert_not_called(*args, **kwargs)
+    def assert_called_once(*args, **kwargs):
+        return mock.assert_called_once(*args, **kwargs)
     def assert_called_once_with(*args, **kwargs):
         return mock.assert_called_once_with(*args, **kwargs)
     def assert_has_calls(*args, **kwargs):
@@ -223,6 +229,9 @@
     funcopy.assert_has_calls = assert_has_calls
     funcopy.assert_any_call = assert_any_call
     funcopy.reset_mock = reset_mock
+    funcopy.assert_called = assert_called
+    funcopy.assert_not_called = assert_not_called
+    funcopy.assert_called_once = assert_called_once
 
     mock._mock_delegate = funcopy
 
diff -r b88be2133323 -r 4e39b4e57673 Lib/unittest/test/testmock/testpatch.py
--- a/Lib/unittest/test/testmock/testpatch.py	Thu Oct 06 14:05:42 2016 -0400
+++ b/Lib/unittest/test/testmock/testpatch.py	Thu Oct 06 14:31:23 2016 -0700
@@ -969,8 +969,14 @@
     def test_autospec_function(self):
         @patch('%s.function' % __name__, autospec=True)
         def test(mock):
+            function.assert_not_called()
+            self.assertRaises(AssertionError, function.assert_called)
+            self.assertRaises(AssertionError, function.assert_called_once)
             function(1)
+            self.assertRaises(AssertionError, function.assert_not_called)
             function.assert_called_with(1)
+            function.assert_called()
+            function.assert_called_once()
             function(2, 3)
             function.assert_called_with(2, 3)
 
diff -r b88be2133323 -r 4e39b4e57673 Misc/NEWS
--- a/Misc/NEWS	Thu Oct 06 14:05:42 2016 -0400
+++ b/Misc/NEWS	Thu Oct 06 14:31:23 2016 -0700
@@ -53,6 +53,9 @@
 Library
 -------
 
+- Issue #28380: unittest.mock Mock autospec functions now properly support
+  assert_called, assert_not_called, and assert_called_once.
+
 - Issue #27181 remove statistics.geometric_mean and defer until 3.7.
 
 - Issue #28229: lzma module now supports pathlib.