(Merge 3.2) Issue #12096: Fix a race condition in

test_threading.test_waitfor(). Patch written by Charles-François Natali.

diff --cc Lib/test/lock_tests.py
Simple merge

diff --cc Misc/NEWS
index b6900091fb40ea5ecfe84cfe5228e04ffcfc5710,eae29528ab31e4c5aeedc07a6049ad8bf5f4605d..ae98b9b29f37f8f072f78d07f64f3c0202ddee70
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -679,13 -429,6 +679,16 @@@ Extension Module
  Tests
  -----
  
++- Issue #12096: Fix a race condition in test_threading.test_waitfor(). Patch
++  written by Charles-François Natali.
++
 +- Issue #11614: import __hello__ prints "Hello World!". Patch written by
 +  Andreas Stührk.
 +
 +- Issue #5723: Improve json tests to be executed with and without accelerations.
 +
 +- Issue #12041: Make test_wait3 more robust.
 +
  - Issue #11873: Change regex in test_compileall to fix occasional failures when
    when the randomly generated temporary path happened to match the regex.