Skip to content

gh-142651: Make call_count of Mock thread safe #142656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kumaraditya303 merged 18 commits into from
Dec 15, 2025
Merged

gh-142651: Make call_count of Mock thread safe #142656

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a401818
Make call_count of Mock thread safe
chaope Dec 13, 2025
d532d23
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 13, 2025
fe7be86
update doc
chaope Dec 13, 2025
29578a9
calculate call_count after append call_args_list
chaope Dec 13, 2025
c2e4ca7
revert change on documentation for call_count.
chaope Dec 13, 2025
e9e6dfa
revert unnecessary change.
chaope Dec 13, 2025
3a4b590
revert blank line deletion
chaope Dec 13, 2025
70e9107
added TestThreadingMockRaceCondition
chaope Dec 13, 2025
dc0d804
Update Misc/NEWS.d/next/Library/2025-12-13-06-17-44.gh-issue-142651.Z…
chaope Dec 13, 2025
f05407e
Update Lib/test/test_unittest/testmock/testthreadingmock.py
chaope Dec 13, 2025
3a81b0d
update test
chaope Dec 13, 2025
23825f4
Merge branch 'fix-issue-142651' of https://github.com/chaope/cpython …
chaope Dec 13, 2025
a76318e
move self._executor.shutdown to addCleanup
chaope Dec 13, 2025
8e2348c
use 3k loops
chaope Dec 13, 2025
e7dcc57
add @requires_resource('cpu')
chaope Dec 13, 2025
851f698
update test according to comments
chaope Dec 13, 2025
3b29867
update according to comments
chaope Dec 13, 2025
16232b8
use threading_helper.start_threads
chaope Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Make call_count of Mock thread safe
  • Loading branch information
@chaope
chaope committed Dec 13, 2025
commit a401818402740042d643e1c26c5c407fe663b60d
22 changes: 22 additions & 0 deletions Lib/test/test_unittest/testmock/testthreadingmock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import time
import unittest
import threading
import concurrent.futures

from test.support import threading_helper
Expand Down Expand Up @@ -196,6 +197,27 @@ def test_reset_mock_resets_wait(self):
m.wait_until_any_call_with()
m.assert_called_once()

def test_call_count_thread_safe(self):

m = ThreadingMock()

# 3k loops reliably reproduces the issue while keeping runtime ~0.6s
LOOPS = 3_000
THREADS = 10

def test_function():
for _ in range(LOOPS):
m()

threads = [threading.Thread(target=test_function) for _ in range(THREADS)]
for thread in threads:
thread.start()
for thread in threads:
thread.join()

self.assertEqual(m.call_count, LOOPS * THREADS,
f"Expected {LOOPS * THREADS}, got {m.call_count}")


if __name__ == "__main__":
unittest.main()
12 changes: 7 additions & 5 deletions Lib/unittest/mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ def reset_mock():
ret.reset_mock()

funcopy.called = False
funcopy.call_count = 0
funcopy.call_args = None
funcopy.call_args_list = _CallList()
funcopy.method_calls = _CallList()
Expand Down Expand Up @@ -490,7 +489,6 @@ def __init__(

__dict__['_mock_called'] = False
__dict__['_mock_call_args'] = None
__dict__['_mock_call_count'] = 0
__dict__['_mock_call_args_list'] = _CallList()
__dict__['_mock_mock_calls'] = _CallList()

Expand Down Expand Up @@ -606,11 +604,17 @@ def __class__(self):
return self._spec_class

called = _delegating_property('called')
call_count = _delegating_property('call_count')
call_args = _delegating_property('call_args')
call_args_list = _delegating_property('call_args_list')
mock_calls = _delegating_property('mock_calls')

@property
def call_count(self):
sig = self._mock_delegate
if sig is None:
return len(self._mock_call_args_list)
return len(sig.call_args_list)


def __get_side_effect(self):
delegated = self._mock_delegate
Expand Down Expand Up @@ -646,7 +650,6 @@ def reset_mock(self, visited=None, *,

self.called = False
self.call_args = None
self.call_count = 0
self.mock_calls = _CallList()
self.call_args_list = _CallList()
self.method_calls = _CallList()
Expand Down Expand Up @@ -1180,7 +1183,6 @@ def _mock_call(self, /, *args, **kwargs):

def _increment_mock_call(self, /, *args, **kwargs):
self.called = True
self.call_count += 1

# handle call_args
# needs to be set here so assertions on call arguments pass before
Expand Down
Loading