From 72460fa68ba98f5aa94cdc842070884403c0fc73 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Mon, 9 Sep 2013 18:48:24 -0500 Subject: Get "stopped" back into repr(Thread) when appropriate. Due to recent changes, a Thread doesn't know that it's over before someone calls .join() or .is_alive(). That meant repr(Thread) continued to include "started" (and not "stopped") before one of those methods was called, even if hours passed since the thread ended. Repaired that. --- Lib/test/test_threading.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'Lib/test/test_threading.py') diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 75ae247de7..c39d5e26c7 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -573,6 +573,31 @@ class ThreadTests(BaseTestCase): # And verify the thread disposed of _tstate_lock. self.assertTrue(t._tstate_lock is None) + def test_repr_stopped(self): + # Verify that "stopped" shows up in repr(Thread) appropriately. + started = _thread.allocate_lock() + finish = _thread.allocate_lock() + started.acquire() + finish.acquire() + def f(): + started.release() + finish.acquire() + t = threading.Thread(target=f) + t.start() + started.acquire() + self.assertIn("started", repr(t)) + finish.release() + # "stopped" should appear in the repr in a reasonable amount of time. + # Implementation detail: as of this writing, that's trivially true + # if .join() is called, and almost trivially true if .is_alive() is + # called. The detail we're testing here is that "stopped" shows up + # "all on its own". + LOOKING_FOR = "stopped" + for i in range(500): + if LOOKING_FOR in repr(t): + break + time.sleep(0.01) + self.assertIn(LOOKING_FOR, repr(t)) # we waited at least 5 seconds class ThreadJoinOnShutdown(BaseTestCase): -- cgit v1.2.1