diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
| commit | 3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (patch) | |
| tree | dd97578d333a72ac825c0e7ad64e4367d8dfe248 /Lib/test/test_threading.py | |
| parent | cc4a4842643d6415ca4a449e9d0557cfb029715a (diff) | |
| parent | 13925008dc11f2a235627dc8c0440c0ce99171d9 (diff) | |
| download | cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.zip cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.gz cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.bz2 | |
#11565: Merge with 3.1.
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 ecbbdbf..5f99b2e 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -570,7 +570,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 |