From: R David Murray <rdmurray@bitdance.com>
Date: Sun, 21 Apr 2013 14:13:43 +0000 (-0400)
Subject: #17065: Use process-unique key for winreg test.
X-Git-Tag: v2.7.5~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cbff51745bf8e79d75cc0ee4597c5142aa0c5fd;p=thirdparty%2FPython%2Fcpython.git

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

Patch by Jeremy Kloth.
---

diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py
index 2799e1948020..683938acd457 100644
--- a/Lib/test/test_winreg.py
+++ b/Lib/test/test_winreg.py
@@ -28,9 +28,12 @@ WIN64_MACHINE = True if machine() == "AMD64" else False
 # 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
index 9c651d314178..89456d7dfc29 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -56,6 +56,12 @@ Library
 - Issue #17526: fix an IndexError raised while passing code without filename to
   inspect.findsource().  Initial patch by Tyler Doyle.
 
+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).
+
 IDLE
 ----