summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_winreg.py
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-04-21 14:13:43 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-04-21 14:13:43 (GMT)
commit5cbff51745bf8e79d75cc0ee4597c5142aa0c5fd (patch)
tree884b46d77cc1978414a2ed90c4fbd490bbb8442d /Lib/test/test_winreg.py
parent69f051c33c50e26e6f37447da0df3b7ebdd2436d (diff)
downloadcpython-5cbff51745bf8e79d75cc0ee4597c5142aa0c5fd.zip
cpython-5cbff51745bf8e79d75cc0ee4597c5142aa0c5fd.tar.gz
cpython-5cbff51745bf8e79d75cc0ee4597c5142aa0c5fd.tar.bz2
#17065: Use process-unique key for winreg test.
Patch by Jeremy Kloth.
Diffstat (limited to 'Lib/test/test_winreg.py')
-rw-r--r--Lib/test/test_winreg.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py
index 2799e19..683938a 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),