From 9cbc589905dbb0f415ab3a995eee48f4906c0418 Mon Sep 17 00:00:00 2001 From: Mario Corchero Date: Thu, 6 Jul 2023 19:54:45 +0200 Subject: [PATCH] gh-106458: Mark `testthreadingmock.py` with `@requires_working_threading` (GH-106366) Mark `testthreadingmock.py` with `threading_helper.requires_working_threading`. Also add longer delays to reduce the change of a race conditions on the tests that validate short timeouts. Backports: 56353b10023ff12c7c8d6288ae4bf7bdcd5d4b6c Signed-off-by: Chris Withers --- lastsync.txt | 2 +- mock/tests/testthreadingmock.py | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lastsync.txt b/lastsync.txt index 2e06272f..9ef9ab7f 100644 --- a/lastsync.txt +++ b/lastsync.txt @@ -1 +1 @@ -3f7c0810f6158a7ff37be432f8d7f9511427489f +2dfc7fae787e65726f24bfe9efe05418b05ee8e2 diff --git a/mock/tests/testthreadingmock.py b/mock/tests/testthreadingmock.py index 70db52d8..fe006904 100644 --- a/mock/tests/testthreadingmock.py +++ b/mock/tests/testthreadingmock.py @@ -133,11 +133,9 @@ def test_wait_failed_with_timeout_override(self): with patch(f"{__name__}.Something", waitable_mock): something = Something() - self.run_async(something.method_1, delay=0.1) + self.run_async(something.method_1, delay=0.5) with self.assertRaises(AssertionError): something.method_1.wait_until_called(timeout=0.05) - with self.assertRaises(AssertionError): - something.method_1.wait_until_any_call_with(timeout=0.05) def test_wait_success_called_before(self): waitable_mock = self._make_mock() @@ -163,10 +161,10 @@ def test_wait_until_any_call_with_positional(self): with patch(f"{__name__}.Something", waitable_mock): something = Something() - self.run_async(something.method_1, 1, delay=0.1) - self.run_async(something.method_1, 2, delay=0.2) - self.run_async(something.method_1, 3, delay=0.3) + self.run_async(something.method_1, 1, delay=0.2) self.assertNotIn(call(1), something.method_1.mock_calls) + self.run_async(something.method_1, 2, delay=0.5) + self.run_async(something.method_1, 3, delay=0.6) something.method_1.wait_until_any_call_with(1) something.method_1.assert_called_with(1) @@ -182,10 +180,10 @@ def test_wait_until_any_call_with_keywords(self): with patch(f"{__name__}.Something", waitable_mock): something = Something() - self.run_async(something.method_1, a=1, delay=0.1) - self.run_async(something.method_1, b=2, delay=0.2) - self.run_async(something.method_1, c=3, delay=0.3) + self.run_async(something.method_1, a=1, delay=0.2) self.assertNotIn(call(a=1), something.method_1.mock_calls) + self.run_async(something.method_1, b=2, delay=0.5) + self.run_async(something.method_1, c=3, delay=0.6) something.method_1.wait_until_any_call_with(a=1) something.method_1.assert_called_with(a=1)