From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:34:00 +0000 (-0700)
Subject: [3.11] gh-109401: Fix threading barrier test_default_timeout() (GH-109875) (#109877)
X-Git-Tag: v3.11.6~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95e616aee099949a3707ec487dfc87b1eae65876;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-109401: Fix threading barrier test_default_timeout() (GH-109875) (#109877)

gh-109401: Fix threading barrier test_default_timeout() (GH-109875)

Increase timeouts. Barrier default timeout should be long enough to
spawn 4 threads on a slow CI.
(cherry picked from commit e5186c3de4194de3ea8c80edb182d786f5e20944)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py
index f16c7ed952cf..bd6e95c2ed5f 100644
--- a/Lib/test/lock_tests.py
+++ b/Lib/test/lock_tests.py
@@ -1015,13 +1015,15 @@ class BarrierTests(BaseTestCase):
         """
         Test the barrier's default timeout
         """
-        # create a barrier with a low default timeout
-        barrier = self.barriertype(self.N, timeout=0.3)
+        # gh-109401: Barrier timeout should be long enough
+        # to create 4 threads on a slow CI.
+        timeout = 1.0
+        barrier = self.barriertype(self.N, timeout=timeout)
         def f():
             i = barrier.wait()
             if i == self.N // 2:
-                # One thread is later than the default timeout of 0.3s.
-                time.sleep(1.0)
+                # One thread is later than the default timeout.
+                time.sleep(timeout * 2)
             self.assertRaises(threading.BrokenBarrierError, barrier.wait)
         self.run_threads(f)