[Python-checkins] CVS: python/dist/src/Lib/test test_threaded_import.py,1.3,1.4

Tim Peters tim_one@users.sourceforge.net
Wed, 29 Aug 2001 22:16:15 -0700


Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv23325/Lib/test

Modified Files:
	test_threaded_import.py 
Log Message:
Add a new function imp.lock_held(), and use it to skip test_threaded_import
when that test is doomed to deadlock.


Index: test_threaded_import.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_threaded_import.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_threaded_import.py	2001/08/29 20:26:24	1.3
--- test_threaded_import.py	2001/08/30 05:16:13	1.4
***************
*** 33,40 ****
  def test_main():        # magic name!  see above
      global N, done
!     import sys
!     for modname in sys.modules:
!         if modname.find('autotest') >= 0:
!             raise TestSkipped("can't run from autotest")
      done.acquire()
      for N in (20, 50) * 3:
--- 33,42 ----
  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 TestSkipped("can't run when import lock is held")
! 
      done.acquire()
      for N in (20, 50) * 3: