gh-118362: Skip tests when threading isn't available (#118666)

* Skip tests when threads aren't available

* Use ThreadPoolExecutor
This commit is contained in:
Dino Viehland 2024-05-06 16:45:04 -07:00 committed by GitHub
parent 636b8d94c9
commit e272195b3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 16 deletions

View File

@ -3,7 +3,7 @@ import unittest
from threading import Thread
from unittest import TestCase
from test.support import is_wasi
from test.support import threading_helper
class C:
@ -11,7 +11,7 @@ class C:
self.v = v
@unittest.skipIf(is_wasi, "WASI has no threads.")
@threading_helper.requires_working_threading()
class TestList(TestCase):
def test_racing_iter_append(self):

View File

@ -7,7 +7,7 @@ import unittest
import weakref
from sys import monitoring
from test.support import is_wasi
from test.support import threading_helper
from threading import Thread, _PyRLock
from unittest import TestCase
@ -87,7 +87,7 @@ class MonitoringTestMixin:
monitoring.free_tool_id(self.tool_id)
@unittest.skipIf(is_wasi, "WASI has no threads.")
@threading_helper.requires_working_threading()
class SetPreTraceMultiThreaded(InstrumentationMultiThreadedMixin, TestCase):
"""Sets tracing one time after the threads have started"""
@ -106,7 +106,7 @@ class SetPreTraceMultiThreaded(InstrumentationMultiThreadedMixin, TestCase):
sys.settrace(self.trace_func)
@unittest.skipIf(is_wasi, "WASI has no threads.")
@threading_helper.requires_working_threading()
class MonitoringMultiThreaded(
MonitoringTestMixin, InstrumentationMultiThreadedMixin, TestCase
):
@ -140,7 +140,7 @@ class MonitoringMultiThreaded(
self.set = not self.set
@unittest.skipIf(is_wasi, "WASI has no threads.")
@threading_helper.requires_working_threading()
class SetTraceMultiThreaded(InstrumentationMultiThreadedMixin, TestCase):
"""Uses sys.settrace and repeatedly toggles instrumentation on and off"""
@ -166,7 +166,7 @@ class SetTraceMultiThreaded(InstrumentationMultiThreadedMixin, TestCase):
self.set = not self.set
@unittest.skipIf(is_wasi, "WASI has no threads.")
@threading_helper.requires_working_threading()
class SetProfileMultiThreaded(InstrumentationMultiThreadedMixin, TestCase):
"""Uses sys.setprofile and repeatedly toggles instrumentation on and off"""
@ -192,7 +192,7 @@ class SetProfileMultiThreaded(InstrumentationMultiThreadedMixin, TestCase):
self.set = not self.set
@unittest.skipIf(is_wasi, "WASI has no threads.")
@threading_helper.requires_working_threading()
class MonitoringMisc(MonitoringTestMixin, TestCase):
def register_callback(self):
def callback(*args):

View File

@ -1,10 +1,11 @@
import unittest
from concurrent.futures import ThreadPoolExecutor
from threading import Thread
from multiprocessing.dummy import Pool
from unittest import TestCase
from test.support import is_wasi
from test.support import threading_helper, import_helper
NTHREADS = 6
@ -15,7 +16,7 @@ ITERS = 100
class A:
attr = 1
@unittest.skipIf(is_wasi, "WASI has no threads.")
@threading_helper.requires_working_threading()
class TestType(TestCase):
def test_attr_cache(self):
def read(id0):
@ -34,11 +35,10 @@ class TestType(TestCase):
A.attr = x
with Pool(NTHREADS) as pool:
pool.apply_async(read, (1,))
pool.apply_async(write, (1,))
pool.close()
pool.join()
with ThreadPoolExecutor(NTHREADS) as pool:
pool.submit(read, (1,))
pool.submit(write, (1,))
pool.shutdown(wait=True)
def test_attr_cache_consistency(self):
class C: