Merge #17065: Use process-unique key for winreg test.

bitdancer · bitdancer · commit 3927d802b672 · 2013-04-21T10:10:50.000-04:00
Patch by Jeremy Kloth.
diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py
@@ -28,9 +28,12 @@
 # tests are only valid up until 6.1
 HAS_REFLECTION = True if WIN_VER < (6, 1) else False
 
-test_key_name = "SOFTWARE\\Python Registry Test Key - Delete Me"
+# Use a per-process key to prevent concurrent test runs (buildbot!) from
+# stomping on each other.
+test_key_base = "Python Test Key [%d] - Delete Me" % (os.getpid(),)
+test_key_name = "SOFTWARE\\" + test_key_base
 # On OS'es that support reflection we should test with a reflected key
-test_reflect_key_name = "SOFTWARE\\Classes\\Python Test Key - Delete Me"
+test_reflect_key_name = "SOFTWARE\\Classes\\" + test_key_base
 
 test_data = [
     ("Int Value",     45,                                      REG_DWORD),
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -141,6 +141,9 @@ Library
 Tests
 -----
 
+- Issue #17065: Use process-unique key for winreg tests to avoid failures if
+  test is run multiple times in parallel (eg: on a buildbot host).
+
 - Issue #12820: add tests for the xml.dom.minicompat module.
   Patch by John Chandler and Phil Connell.
 
