Use default timeout for barrier in test

Author: duaneg

Lib/test/test_concurrent_futures/executor.py

@@ -256,7 +256,7 @@ def test_shutdown_notifies_cancelled_futures(self):
 
         # gh-136655: ensure cancelled futures are notified
         count = self.worker_count * 2
-        barrier = self.create_barrier(self.worker_count + 1)
+        barrier = self.create_barrier(self.worker_count + 1, timeout=1)
         with self.executor as exec:
             fs = [exec.submit(blocking_raiser,
                               barrier if index < self.worker_count else None)
@@ -277,5 +277,5 @@ def test_shutdown_notifies_cancelled_futures(self):
 
 def blocking_raiser(barrier=None):
     if barrier is not None:
-        barrier.wait(1)
+        barrier.wait()
     raise FalseyBoolException()

Lib/test/test_concurrent_futures/util.py

@@ -80,8 +80,8 @@ def get_context(self):
 class ThreadPoolMixin(ExecutorMixin):
     executor_type = futures.ThreadPoolExecutor
 
-    def create_barrier(self, count):
-        return threading.Barrier(count)
+    def create_barrier(self, count, **kwargs):
+        return threading.Barrier(count, **kwargs)
 
     def create_event(self):
         return threading.Event()
@@ -91,7 +91,7 @@ def create_event(self):
 class InterpreterPoolMixin(ExecutorMixin):
     executor_type = futures.InterpreterPoolExecutor
 
-    def create_barrier(self, count):
+    def create_barrier(self, count, **kwargs):
         self.skipTest("InterpreterPoolExecutor doesn't support barriers")
 
     def create_event(self):
@@ -113,8 +113,8 @@ def get_context(self):
             self.skipTest("TSAN doesn't support threads after fork")
         return super().get_context()
 
-    def create_barrier(self, count):
-        return self.manager.Barrier(count)
+    def create_barrier(self, count, **kwargs):
+        return self.manager.Barrier(count, **kwargs)
 
     def create_event(self):
         return self.manager.Event()
@@ -131,8 +131,8 @@ def get_context(self):
             self.skipTest("ProcessPoolExecutor unavailable on this system")
         return super().get_context()
 
-    def create_barrier(self, count):
-        return self.manager.Barrier(count)
+    def create_barrier(self, count, **kwargs):
+        return self.manager.Barrier(count, **kwargs)
 
     def create_event(self):
         return self.manager.Event()
@@ -153,8 +153,8 @@ def get_context(self):
             self.skipTest("TSAN doesn't support threads after fork")
         return super().get_context()
 
-    def create_barrier(self, count):
-        return self.manager.Barrier(count)
+    def create_barrier(self, count, **kwargs):
+        return self.manager.Barrier(count, **kwargs)
 
     def create_event(self):
         return self.manager.Event()