Commit 579bed73 authored by Tim Peters's avatar Tim Peters

Rewrote. As reported on c.l.py, when the test suite is run via

"import test.autotest", temp_imp failed because the import lock was
still held at the test's end (the test assumed it wouldn't be), and
then a RuntimeError got raised at the end of the entire suite run because
test_imp cleared the import lock as a side effect of trying to test that
the import lock wasn't held (but a legitimate import is in progress,
so the lock should be held, and the import machinery complained when it
found that the lock was unexpectedly cleareed).

Also removed the unittest scaffolding.  It didn't buy anything here, and
the test was raising regrtest's TestFailed instead of using the unittest
failure-reporting mechanisms.
parent 51183415
import imp
import unittest
from test.test_support import TestFailed, run_unittest
from test.test_support import TestFailed
class ImpLock(unittest.TestCase):
def verify_lock_state(expected):
if imp.lock_held() != expected:
raise TestFailed("expected imp.lock_held() to be %r" % expected)
# XXX this test is woefully inadequate, please fix me
def testLock(self):
LOOPS = 50
for i in range(LOOPS):
imp.acquire_lock()
for i in range(LOOPS):
imp.release_lock()
def testLock():
LOOPS = 50
# The import lock may already be held, e.g. if the test suite is run
# via "import test.autotest".
lock_held_at_start = imp.lock_held()
verify_lock_state(lock_held_at_start)
for i in range(LOOPS):
imp.acquire_lock()
verify_lock_state(True)
for i in range(LOOPS):
try:
imp.release_lock()
except RuntimeError:
pass
else:
raise TestFailed, \
"release_lock() without lock should raise RuntimeError"
for i in range(LOOPS):
imp.release_lock()
# The original state should be restored now.
verify_lock_state(lock_held_at_start)
if not lock_held_at_start:
try:
imp.release_lock()
except RuntimeError:
pass
else:
raise TestFailed("release_lock() without lock should raise "
"RuntimeError")
def test_main():
run_unittest(ImpLock)
testLock()
if __name__ == "__main__":
test_main()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment