- Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.
Patch from Nicola Palumbo and Laurent De Buyst.
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 1b1c9f4..c805726 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -519,8 +519,14 @@
side_effect = property(__get_side_effect, __set_side_effect)
- def reset_mock(self):
+ def reset_mock(self, visited=None):
"Restore the mock object to its initial state."
+ if visited is None:
+ visited = []
+ if id(self) in visited:
+ return
+ visited.append(id(self))
+
self.called = False
self.call_args = None
self.call_count = 0
@@ -531,11 +537,11 @@
for child in self._mock_children.values():
if isinstance(child, _SpecState):
continue
- child.reset_mock()
+ child.reset_mock(visited)
ret = self._mock_return_value
if _is_instance_mock(ret) and ret is not self:
- ret.reset_mock()
+ ret.reset_mock(visited)
def configure_mock(self, **kwargs):
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
index 23675b9..4fe6314 100644
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -237,6 +237,9 @@
# used to cause recursion
mock.reset_mock()
+ def test_reset_mock_on_mock_open_issue_18622(self):
+ a = mock.mock_open()
+ a.reset_mock()
def test_call(self):
mock = Mock()
diff --git a/Misc/ACKS b/Misc/ACKS
index b377050..63cf4da 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1533,3 +1533,5 @@
Gennadiy Zlobin
Doug Zongker
Peter Åstrand
+Laurent De Buyst
+Nicola Palumbo
diff --git a/Misc/NEWS b/Misc/NEWS
index bdbd74e..874bbd9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,9 @@
Library
-------
+- Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.
+ Patch from Nicola Palumbo and Laurent De Buyst.
+
- Issue #24608: chunk.Chunk.read() now always returns bytes, not str.
- Issue #18684: Fixed reading out of the buffer in the re module.