Make time.sleep calls go to 0 for common testing.
diff --git a/Lib/test/test_dummy_thread.py b/Lib/test/test_dummy_thread.py
index 7be430c..7237670 100644
--- a/Lib/test/test_dummy_thread.py
+++ b/Lib/test/test_dummy_thread.py
@@ -12,6 +12,8 @@
import unittest
from test import test_support
+DELAY = 0 # Set > 0 when testing a module other than dummy_thread, such as
+ # the 'thread' module.
class LockTests(unittest.TestCase):
"""Test lock objects."""
@@ -67,18 +69,17 @@
to_unlock.release()
self.lock.acquire()
- delay = 1 #In seconds
start_time = int(time.time())
- _thread.start_new_thread(delay_unlock,(self.lock, delay))
+ _thread.start_new_thread(delay_unlock,(self.lock, DELAY))
if test_support.verbose:
print
print "*** Waiting for thread to release the lock "\
- "(approx. %s sec.) ***" % delay
+ "(approx. %s sec.) ***" % DELAY
self.lock.acquire()
end_time = int(time.time())
if test_support.verbose:
print "done"
- self.failUnless((end_time - start_time) >= delay,
+ self.failUnless((end_time - start_time) >= DELAY,
"Blocking by unconditional acquiring failed.")
class MiscTests(unittest.TestCase):
@@ -134,26 +135,30 @@
queue.put(_thread.get_ident())
thread_count = 5
- delay = 1.5
testing_queue = Queue.Queue(thread_count)
if test_support.verbose:
print
print "*** Testing multiple thread creation "\
- "(will take approx. %s to %s sec.) ***" % (delay, thread_count)
+ "(will take approx. %s to %s sec.) ***" % (DELAY, thread_count)
for count in xrange(thread_count):
+ if DELAY:
+ local_delay = round(random.random(), 1)
+ else:
+ local_delay = 0
_thread.start_new_thread(queue_mark,
- (testing_queue, round(random.random(), 1)))
- time.sleep(delay)
+ (testing_queue, local_delay))
+ time.sleep(DELAY)
if test_support.verbose:
print 'done'
self.failUnless(testing_queue.qsize() == thread_count,
"Not all %s threads executed properly after %s sec." %
- (thread_count, delay))
+ (thread_count, DELAY))
def test_main(imported_module=None):
- global _thread
+ global _thread, DELAY
if imported_module:
_thread = imported_module
+ DELAY = 2
if test_support.verbose:
print
print "*** Using %s as _thread module ***" % _thread