2004-07-14 16:11:50 -03:00
|
|
|
import unittest
|
|
|
|
from doctest import DocTestSuite
|
2008-05-20 18:35:26 -03:00
|
|
|
from test import support
|
Merged revisions 80552-80556,80564-80566,80568-80571 via svnmerge from
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
........
2010-04-28 19:31:17 -03:00
|
|
|
threading = support.import_module('threading')
|
Merged revisions 60053-60078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60054 | christian.heimes | 2008-01-18 20:12:56 +0100 (Fri, 18 Jan 2008) | 1 line
Silence Coverity false alerts with CIDs #172, #183, #184
........
r60057 | guido.van.rossum | 2008-01-18 21:56:30 +0100 (Fri, 18 Jan 2008) | 3 lines
Fix an edge case whereby the __del__() method of a classic class could
create a new weakref to the object.
........
r60058 | raymond.hettinger | 2008-01-18 22:14:58 +0100 (Fri, 18 Jan 2008) | 1 line
Better variable name in an example.
........
r60063 | guido.van.rossum | 2008-01-19 00:05:40 +0100 (Sat, 19 Jan 2008) | 3 lines
This got fixed for classic classes in r60057,
and backported to 2.5.2 in 60056.
........
r60068 | jeffrey.yasskin | 2008-01-19 10:56:06 +0100 (Sat, 19 Jan 2008) | 4 lines
Several tweaks: add construction from strings and .from_decimal(), change
__init__ to __new__ to enforce immutability, and remove "rational." from repr
and the parens from str.
........
r60069 | georg.brandl | 2008-01-19 11:11:27 +0100 (Sat, 19 Jan 2008) | 2 lines
Fix markup.
........
r60070 | georg.brandl | 2008-01-19 11:16:09 +0100 (Sat, 19 Jan 2008) | 3 lines
Amend curses docs by info how to write non-ascii characters.
Thanks to Jeroen Ruigrok van der Werven.
........
r60071 | georg.brandl | 2008-01-19 11:18:07 +0100 (Sat, 19 Jan 2008) | 2 lines
Indentation normalization.
........
r60073 | facundo.batista | 2008-01-19 13:32:27 +0100 (Sat, 19 Jan 2008) | 5 lines
Fix issue #1822: MIMEMultipart.is_multipart() behaves correctly for a
just-created (and empty) instance. Added tests for this. Thanks
Jonathan Share.
........
r60074 | andrew.kuchling | 2008-01-19 14:33:20 +0100 (Sat, 19 Jan 2008) | 1 line
Polish sentence
........
r60075 | christian.heimes | 2008-01-19 14:46:06 +0100 (Sat, 19 Jan 2008) | 1 line
Added unit test to verify that threading.local doesn't cause ref leaks. It seems that the thread local storage always keeps the storage of the last stopped thread alive. Can anybody comment on it, please?
........
r60076 | christian.heimes | 2008-01-19 16:06:09 +0100 (Sat, 19 Jan 2008) | 1 line
Update for threading.local test.
........
r60077 | andrew.kuchling | 2008-01-19 16:16:37 +0100 (Sat, 19 Jan 2008) | 1 line
Polish sentence
........
r60078 | georg.brandl | 2008-01-19 16:22:16 +0100 (Sat, 19 Jan 2008) | 2 lines
Fix typos.
........
2008-01-19 12:21:02 -04:00
|
|
|
import weakref
|
|
|
|
import gc
|
|
|
|
|
|
|
|
class Weak(object):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def target(local, weaklist):
|
|
|
|
weak = Weak()
|
|
|
|
local.weak = weak
|
|
|
|
weaklist.append(weakref.ref(weak))
|
|
|
|
|
|
|
|
class ThreadingLocalTest(unittest.TestCase):
|
|
|
|
|
|
|
|
def test_local_refs(self):
|
|
|
|
self._local_refs(20)
|
|
|
|
self._local_refs(50)
|
|
|
|
self._local_refs(100)
|
|
|
|
|
|
|
|
def _local_refs(self, n):
|
|
|
|
local = threading.local()
|
|
|
|
weaklist = []
|
|
|
|
for i in range(n):
|
|
|
|
t = threading.Thread(target=target, args=(local, weaklist))
|
|
|
|
t.start()
|
|
|
|
t.join()
|
|
|
|
del t
|
|
|
|
|
|
|
|
gc.collect()
|
|
|
|
self.assertEqual(len(weaklist), n)
|
|
|
|
|
|
|
|
# XXX threading.local keeps the local of the last stopped thread alive.
|
|
|
|
deadlist = [weak for weak in weaklist if weak() is None]
|
|
|
|
self.assertEqual(len(deadlist), n-1)
|
|
|
|
|
|
|
|
# Assignment to the same thread local frees it sometimes (!)
|
|
|
|
local.someothervar = None
|
|
|
|
gc.collect()
|
|
|
|
deadlist = [weak for weak in weaklist if weak() is None]
|
2010-01-18 20:09:57 -04:00
|
|
|
self.assertIn(len(deadlist), (n-1, n), (n, len(deadlist)))
|
2004-07-14 16:11:50 -03:00
|
|
|
|
2008-06-30 20:30:24 -03:00
|
|
|
def test_derived(self):
|
|
|
|
# Issue 3088: if there is a threads switch inside the __init__
|
|
|
|
# of a threading.local derived class, the per-thread dictionary
|
|
|
|
# is created but not correctly set on the object.
|
|
|
|
# The first member set may be bogus.
|
|
|
|
import time
|
|
|
|
class Local(threading.local):
|
|
|
|
def __init__(self):
|
|
|
|
time.sleep(0.01)
|
|
|
|
local = Local()
|
|
|
|
|
|
|
|
def f(i):
|
|
|
|
local.x = i
|
|
|
|
# Simply check that the variable is correctly set
|
|
|
|
self.assertEqual(local.x, i)
|
|
|
|
|
|
|
|
threads= []
|
|
|
|
for i in range(10):
|
|
|
|
t = threading.Thread(target=f, args=(i,))
|
|
|
|
t.start()
|
|
|
|
threads.append(t)
|
|
|
|
|
|
|
|
for t in threads:
|
|
|
|
t.join()
|
|
|
|
|
2009-09-29 01:57:18 -03:00
|
|
|
def test_derived_cycle_dealloc(self):
|
|
|
|
# http://bugs.python.org/issue6990
|
|
|
|
class Local(threading.local):
|
|
|
|
pass
|
|
|
|
locals = None
|
|
|
|
passed = False
|
|
|
|
e1 = threading.Event()
|
|
|
|
e2 = threading.Event()
|
|
|
|
|
|
|
|
def f():
|
|
|
|
nonlocal passed
|
|
|
|
# 1) Involve Local in a cycle
|
|
|
|
cycle = [Local()]
|
|
|
|
cycle.append(cycle)
|
|
|
|
cycle[0].foo = 'bar'
|
|
|
|
|
|
|
|
# 2) GC the cycle (triggers threadmodule.c::local_clear
|
|
|
|
# before local_dealloc)
|
|
|
|
del cycle
|
|
|
|
gc.collect()
|
|
|
|
e1.set()
|
|
|
|
e2.wait()
|
|
|
|
|
|
|
|
# 4) New Locals should be empty
|
|
|
|
passed = all(not hasattr(local, 'foo') for local in locals)
|
|
|
|
|
|
|
|
t = threading.Thread(target=f)
|
|
|
|
t.start()
|
|
|
|
e1.wait()
|
|
|
|
|
|
|
|
# 3) New Locals should recycle the original's address. Creating
|
|
|
|
# them in the thread overwrites the thread state and avoids the
|
|
|
|
# bug
|
|
|
|
locals = [Local() for i in range(10)]
|
|
|
|
e2.set()
|
|
|
|
t.join()
|
|
|
|
|
|
|
|
self.assertTrue(passed)
|
|
|
|
|
2010-02-22 15:55:46 -04:00
|
|
|
def test_arguments(self):
|
|
|
|
# Issue 1522237
|
|
|
|
from _thread import _local as local
|
|
|
|
from _threading_local import local as py_local
|
|
|
|
|
|
|
|
for cls in (local, py_local):
|
|
|
|
class MyLocal(cls):
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
|
|
pass
|
|
|
|
|
|
|
|
MyLocal(a=1)
|
|
|
|
MyLocal(1)
|
|
|
|
self.assertRaises(TypeError, cls, a=1)
|
|
|
|
self.assertRaises(TypeError, cls, 1)
|
|
|
|
|
2008-06-30 20:30:24 -03:00
|
|
|
|
2004-07-14 16:11:50 -03:00
|
|
|
def test_main():
|
Merged revisions 60053-60078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60054 | christian.heimes | 2008-01-18 20:12:56 +0100 (Fri, 18 Jan 2008) | 1 line
Silence Coverity false alerts with CIDs #172, #183, #184
........
r60057 | guido.van.rossum | 2008-01-18 21:56:30 +0100 (Fri, 18 Jan 2008) | 3 lines
Fix an edge case whereby the __del__() method of a classic class could
create a new weakref to the object.
........
r60058 | raymond.hettinger | 2008-01-18 22:14:58 +0100 (Fri, 18 Jan 2008) | 1 line
Better variable name in an example.
........
r60063 | guido.van.rossum | 2008-01-19 00:05:40 +0100 (Sat, 19 Jan 2008) | 3 lines
This got fixed for classic classes in r60057,
and backported to 2.5.2 in 60056.
........
r60068 | jeffrey.yasskin | 2008-01-19 10:56:06 +0100 (Sat, 19 Jan 2008) | 4 lines
Several tweaks: add construction from strings and .from_decimal(), change
__init__ to __new__ to enforce immutability, and remove "rational." from repr
and the parens from str.
........
r60069 | georg.brandl | 2008-01-19 11:11:27 +0100 (Sat, 19 Jan 2008) | 2 lines
Fix markup.
........
r60070 | georg.brandl | 2008-01-19 11:16:09 +0100 (Sat, 19 Jan 2008) | 3 lines
Amend curses docs by info how to write non-ascii characters.
Thanks to Jeroen Ruigrok van der Werven.
........
r60071 | georg.brandl | 2008-01-19 11:18:07 +0100 (Sat, 19 Jan 2008) | 2 lines
Indentation normalization.
........
r60073 | facundo.batista | 2008-01-19 13:32:27 +0100 (Sat, 19 Jan 2008) | 5 lines
Fix issue #1822: MIMEMultipart.is_multipart() behaves correctly for a
just-created (and empty) instance. Added tests for this. Thanks
Jonathan Share.
........
r60074 | andrew.kuchling | 2008-01-19 14:33:20 +0100 (Sat, 19 Jan 2008) | 1 line
Polish sentence
........
r60075 | christian.heimes | 2008-01-19 14:46:06 +0100 (Sat, 19 Jan 2008) | 1 line
Added unit test to verify that threading.local doesn't cause ref leaks. It seems that the thread local storage always keeps the storage of the last stopped thread alive. Can anybody comment on it, please?
........
r60076 | christian.heimes | 2008-01-19 16:06:09 +0100 (Sat, 19 Jan 2008) | 1 line
Update for threading.local test.
........
r60077 | andrew.kuchling | 2008-01-19 16:16:37 +0100 (Sat, 19 Jan 2008) | 1 line
Polish sentence
........
r60078 | georg.brandl | 2008-01-19 16:22:16 +0100 (Sat, 19 Jan 2008) | 2 lines
Fix typos.
........
2008-01-19 12:21:02 -04:00
|
|
|
suite = unittest.TestSuite()
|
|
|
|
suite.addTest(DocTestSuite('_threading_local'))
|
|
|
|
suite.addTest(unittest.makeSuite(ThreadingLocalTest))
|
2004-07-14 16:11:50 -03:00
|
|
|
|
|
|
|
try:
|
|
|
|
from thread import _local
|
|
|
|
except ImportError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
import _threading_local
|
|
|
|
local_orig = _threading_local.local
|
2004-08-28 11:58:31 -03:00
|
|
|
def setUp(test):
|
2004-07-14 16:11:50 -03:00
|
|
|
_threading_local.local = _local
|
2004-08-28 11:58:31 -03:00
|
|
|
def tearDown(test):
|
2004-07-14 16:11:50 -03:00
|
|
|
_threading_local.local = local_orig
|
|
|
|
suite.addTest(DocTestSuite('_threading_local',
|
|
|
|
setUp=setUp, tearDown=tearDown)
|
|
|
|
)
|
|
|
|
|
2008-05-20 18:35:26 -03:00
|
|
|
support.run_unittest(suite)
|
2004-07-14 16:11:50 -03:00
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
test_main()
|