From b7a515609d5029772243c1c7cda807cfd9bb9f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 7 Jun 2009 17:55:17 +0000 Subject: Issue #6221: Delete test registry key before running the test. --- Lib/test/test_winreg.py | 21 +++++++++++++++++++++ Misc/NEWS | 2 ++ 2 files changed, 23 insertions(+) diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py index 0b778b2..3b314dd 100644 --- a/Lib/test/test_winreg.py +++ b/Lib/test/test_winreg.py @@ -28,6 +28,27 @@ test_data = [ class WinregTests(unittest.TestCase): remote_name = None + def setUp(self): + # Make sure that the test key is absent when the test + # starts. + self.delete_tree(HKEY_CURRENT_USER, test_key_name) + + def delete_tree(self, root, subkey): + try: + hkey = OpenKey(root, subkey, KEY_ALL_ACCESS) + except WindowsError: + # subkey does not exist + return + while True: + try: + subsubkey = EnumKey(hkey, 0) + except WindowsError: + # no more subkeys + break + self.delete_tree(hkey, subsubkey) + CloseKey(hkey) + DeleteKey(root, subkey) + def WriteTestData(self, root_key, subkeystr="sub_key"): # Set the default value for this key. SetValue(root_key, test_key_name, REG_SZ, "Default value") diff --git a/Misc/NEWS b/Misc/NEWS index dd544dd..7673f99 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -46,6 +46,8 @@ Library Windows ------- +- Issue #6221: Delete test registry key before running the test. + - Issue #6158: Package Sine-1000Hz-300ms.aif in MSI file. C-API -- cgit v0.12