traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 82919 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82919 | antoine.pitrou | 2010-07-16 21:10:38 +0200 (ven., 16 juil. 2010) | 4 lines

  Fix possible failure in pickling tests due to different instantiations
  of the random module being around.
........
This commit is contained in:
Antoine Pitrou 2010-07-16 19:11:23 +00:00
parent bd39f9553a
commit 4393933835
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_threaded_import.py
View File

@ -27,6 +27,16 @@ def task(N, done, done_tasks, errors):
class ThreadedImportTests(unittest.TestCase): class ThreadedImportTests(unittest.TestCase):
def setUp(self):
self.old_random = sys.modules.pop('random', None)
def tearDown(self):
# If the `random` module was already initialized, we restore the
# old module at the end so that pickling tests don't fail.
# See http://bugs.python.org/issue3657#msg110461
if self.old_random is not None:
sys.modules['random'] = self.old_random
def test_parallel_module_init(self): def test_parallel_module_init(self):
if imp.lock_held(): if imp.lock_held():
# This triggers on, e.g., from test import autotest. # This triggers on, e.g., from test import autotest.