[Python-checkins] r85790 - python/branches/release27-maint/Lib/test/test_winreg.py

Fri Oct 22 13:47:07 CEST 2010

Author: hirokazu.yamamoto
Date: Fri Oct 22 13:47:07 2010
New Revision: 85790
Log:
#9289: Workaround for test_long_key(test_winreg) failure on Win2000.
Modified:
 python/branches/release27-maint/Lib/test/test_winreg.py
Modified: python/branches/release27-maint/Lib/test/test_winreg.py
==============================================================================

--- python/branches/release27-maint/Lib/test/test_winreg.py	(original)
+++ python/branches/release27-maint/Lib/test/test_winreg.py	Fri Oct 22 13:47:07 2010
@@ -261,7 +261,8 @@
 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 @@
 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):
