From: Hirokazu Yamamoto Date: Fri, 22 Oct 2010 11:47:07 +0000 (+0000) Subject: #9289: Workaround for test_long_key(test_winreg) failure on Win2000. X-Git-Tag: v2.7.1rc1~119 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecdead62b4d7d6870c16a95f8dfcb40cd16bf516;p=python #9289: Workaround for test_long_key(test_winreg) failure on Win2000. RegDeleteKeyA fails with ERROR_MORE_DATA if the length of 2nd parameter exceeds 260. --- diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py index da3a9187fd..ad4cf42958 100644 --- a/Lib/test/test_winreg.py +++ b/Lib/test/test_winreg.py @@ -261,7 +261,8 @@ class LocalWinregTests(BaseWinregTests): finally: done = True thread.join() - DeleteKey(HKEY_CURRENT_USER, test_key_name+'\\changing_value') + with OpenKey(HKEY_CURRENT_USER, test_key_name, 0, KEY_ALL_ACCESS) as key: + DeleteKey(key, 'changing_value') DeleteKey(HKEY_CURRENT_USER, test_key_name) def test_long_key(self): @@ -275,7 +276,8 @@ class LocalWinregTests(BaseWinregTests): num_subkeys, num_values, t = QueryInfoKey(key) EnumKey(key, 0) finally: - DeleteKey(HKEY_CURRENT_USER, '\\'.join((test_key_name, name))) + with OpenKey(HKEY_CURRENT_USER, test_key_name, 0, KEY_ALL_ACCESS) as key: + DeleteKey(key, name) DeleteKey(HKEY_CURRENT_USER, test_key_name) def test_dynamic_key(self):