mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r80552 | victor.stinner | 2010-04-27 23:46:03 +0200 (mar., 27 avril 2010) | 3 lines Issue #7449, part 1: fix test_support.py for Python compiled without thread ........ r80553 | victor.stinner | 2010-04-27 23:47:01 +0200 (mar., 27 avril 2010) | 1 line Issue #7449, part 2: regrtest.py -j option requires thread support ........ r80554 | victor.stinner | 2010-04-27 23:51:26 +0200 (mar., 27 avril 2010) | 9 lines Issue #7449 part 3, test_doctest: import trace module in test_coverage() Import trace module fail if the threading module is missing. test_coverage() is only used if test_doctest.py is used with the -c option. This commit allows to execute the test suite without thread support. Move "import trace" in test_coverage() and use test_support.import_module('trace'). ........ r80555 | victor.stinner | 2010-04-27 23:56:26 +0200 (mar., 27 avril 2010) | 6 lines Issue #7449, part 4: skip test_multiprocessing if thread support is disabled import threading after _multiprocessing to raise a more revelant error message: "No module named _multiprocessing". _multiprocessing is not compiled without thread support. ........ r80556 | victor.stinner | 2010-04-28 00:01:24 +0200 (mer., 28 avril 2010) | 8 lines Issue #7449, part 5: split Test.test_open() of ctypes/test/test_errno.py * Split Test.test_open() in 2 functions: test_open() and test_thread_open() * Skip test_open() and test_thread_open() if we are unable to find the C library * Skip test_thread_open() if thread support is disabled * Use unittest.skipUnless(os.name == "nt", ...) on test_GetLastError() ........ r80564 | victor.stinner | 2010-04-28 00:59:35 +0200 (mer., 28 avril 2010) | 4 lines Issue #7449, part 6: fix test_hashlib for missing threading module Move @test_support.reap_thread decorator from test_main() to test_threaded_hashing(). ........ r80565 | victor.stinner | 2010-04-28 01:01:29 +0200 (mer., 28 avril 2010) | 6 lines Issue #7449, part 7: simplify threading detection in test_capi * Skip TestPendingCalls if threading module is missing * Test if threading module is present or not, instead of test the presence of _testcapi._test_thread_state ........ r80566 | victor.stinner | 2010-04-28 01:03:16 +0200 (mer., 28 avril 2010) | 4 lines Issue #7449, part 8: don't skip the whole test_asynchat if threading is missing TestFifo can be executed without the threading module ........ r80568 | victor.stinner | 2010-04-28 01:14:58 +0200 (mer., 28 avril 2010) | 6 lines Issue #7449, part 9: fix test_xmlrpclib for missing threading module * Skip testcases using threads if threading module is missing * Use "http://" instead of URL in ServerProxyTestCase if threading is missing because URL is not set in this case ........ r80569 | victor.stinner | 2010-04-28 01:33:58 +0200 (mer., 28 avril 2010) | 6 lines Partial revert of r80556 (Issue #7449, part 5, fix ctypes test) Rewrite r80556: the thread test have to be executed just after the test on libc_open() and so the test cannot be splitted in two functions (without duplicating code, and I don't want to duplicate code). ........ r80570 | victor.stinner | 2010-04-28 01:51:16 +0200 (mer., 28 avril 2010) | 8 lines Issue #7449, part 10: test_cmd imports trace module using test_support.import_module() Use test_support.import_module() instead of import to raise a SkipTest exception if the import fail. Import trace fails if the threading module is missing. See also part 3: test_doctest: import trace module in test_coverage(). ........ r80571 | victor.stinner | 2010-04-28 01:55:59 +0200 (mer., 28 avril 2010) | 6 lines Issue #7449, last part (11): fix many tests if thread support is disabled * Use try/except ImportError or test_support.import_module() to import thread and threading modules * Add @unittest.skipUnless(threading, ...) to testcases using threads ........
76 lines
2.5 KiB
Python
76 lines
2.5 KiB
Python
# This is a variant of the very old (early 90's) file
|
|
# Demo/threads/bug.py. It simply provokes a number of threads into
|
|
# trying to import the same module "at the same time".
|
|
# There are no pleasant failure modes -- most likely is that Python
|
|
# complains several times about module random having no attribute
|
|
# randrange, and then Python hangs.
|
|
|
|
import unittest
|
|
from test.support import verbose, TestFailed, import_module
|
|
thread = import_module('_thread')
|
|
|
|
critical_section = thread.allocate_lock()
|
|
done = thread.allocate_lock()
|
|
|
|
def task():
|
|
global N, critical_section, done
|
|
import random
|
|
x = random.randrange(1, 3)
|
|
critical_section.acquire()
|
|
N -= 1
|
|
# Must release critical_section before releasing done, else the main
|
|
# thread can exit and set critical_section to None as part of global
|
|
# teardown; then critical_section.release() raises AttributeError.
|
|
finished = N == 0
|
|
critical_section.release()
|
|
if finished:
|
|
done.release()
|
|
|
|
def test_import_hangers():
|
|
import sys
|
|
if verbose:
|
|
print("testing import hangers ...", end=' ')
|
|
|
|
import test.threaded_import_hangers
|
|
try:
|
|
if test.threaded_import_hangers.errors:
|
|
raise TestFailed(test.threaded_import_hangers.errors)
|
|
elif verbose:
|
|
print("OK.")
|
|
finally:
|
|
# In case this test is run again, make sure the helper module
|
|
# gets loaded from scratch again.
|
|
del sys.modules['test.threaded_import_hangers']
|
|
|
|
# Tricky: When regrtest imports this module, the thread running regrtest
|
|
# grabs the import lock and won't let go of it until this module returns.
|
|
# All other threads attempting an import hang for the duration. Since
|
|
# this test spawns threads that do little *but* import, we can't do that
|
|
# successfully until after this module finishes importing and regrtest
|
|
# regains control. To make this work, a special case was added to
|
|
# regrtest to invoke a module's "test_main" function (if any) after
|
|
# importing it.
|
|
|
|
def test_main(): # magic name! see above
|
|
global N, done
|
|
|
|
import imp
|
|
if imp.lock_held():
|
|
# This triggers on, e.g., from test import autotest.
|
|
raise unittest.SkipTest("can't run when import lock is held")
|
|
|
|
done.acquire()
|
|
for N in (20, 50) * 3:
|
|
if verbose:
|
|
print("Trying", N, "threads ...", end=' ')
|
|
for i in range(N):
|
|
thread.start_new_thread(task, ())
|
|
done.acquire()
|
|
if verbose:
|
|
print("OK.")
|
|
done.release()
|
|
|
|
test_import_hangers()
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|