diff options
author | Skip Montanaro <skip@pobox.com> | 2011-03-19 14:15:28 (GMT) |
---|---|---|
committer | Skip Montanaro <skip@pobox.com> | 2011-03-19 14:15:28 (GMT) |
commit | b61efd0a68a392e22e5f4a46e03b250977e6236b (patch) | |
tree | b98bee40cb949aca3c50392d72d9858487dbb890 /Lib/test/test_threading.py | |
parent | b40dea7499281b288f513fdbe17dad198eb21ffe (diff) | |
parent | a4d5b0cb620d8dfc07623f4fe2b551257217589d (diff) | |
download | cpython-b61efd0a68a392e22e5f4a46e03b250977e6236b.zip cpython-b61efd0a68a392e22e5f4a46e03b250977e6236b.tar.gz cpython-b61efd0a68a392e22e5f4a46e03b250977e6236b.tar.bz2 |
commit merge
Diffstat (limited to 'Lib/test/test_threading.py')
-rw-r--r-- | Lib/test/test_threading.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 029218d..c107652 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -578,7 +578,7 @@ class ThreadJoinOnShutdown(BaseTestCase): # This acquires the lock and then waits until the child has forked # before returning, which will release the lock soon after. If # someone else tries to fix this test case by acquiring this lock - # before forking instead of reseting it, the test case will + # before forking instead of resetting it, the test case will # deadlock when it shouldn't. condition = w._block orig_acquire = condition.acquire |