Merged revisions 81547 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r81547 | brian.curtin | 2010-05-26 12:43:50 -0500 (Wed, 26 May 2010) | 6 lines
Fix #2810 - handle the case where some registry calls return
ERROR_MORE_DATA, requiring another call to get the remaining data.
Patch by Daniel Stutzbach
........
diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py
index fd28852..37ec2bc 100644
--- a/Lib/test/test_winreg.py
+++ b/Lib/test/test_winreg.py
@@ -5,6 +5,7 @@
import os, sys
import unittest
from test import support
+threading = support.import_module("threading")
# Do this first so test will be skipped if module doesn't exist
support.import_module('winreg')
@@ -185,6 +186,59 @@
self.assertEqual(type(r), str)
self.assertEqual(r, os.environ["windir"] + "\\test")
+ def test_changing_value(self):
+ # Issue2810: A race condition in 2.6 and 3.1 may cause
+ # EnumValue or QueryValue to throw "WindowsError: More data is
+ # available"
+ done = False
+
+ class VeryActiveThread(threading.Thread):
+ def run(self):
+ with CreateKey(HKEY_CURRENT_USER, test_key_name) as key:
+ use_short = True
+ long_string = 'x'*2000
+ while not done:
+ s = 'x' if use_short else long_string
+ use_short = not use_short
+ SetValue(key, 'changing_value', REG_SZ, s)
+
+ thread = VeryActiveThread()
+ thread.start()
+ try:
+ with CreateKey(HKEY_CURRENT_USER,
+ test_key_name+'\\changing_value') as key:
+ for _ in range(1000):
+ num_subkeys, num_values, t = QueryInfoKey(key)
+ for i in range(num_values):
+ name = EnumValue(key, i)
+ QueryValue(key, name[0])
+ finally:
+ done = True
+ thread.join()
+ DeleteKey(HKEY_CURRENT_USER, test_key_name+'\\changing_value')
+ DeleteKey(HKEY_CURRENT_USER, test_key_name)
+
+ def test_long_key(self):
+ # Issue2810, in 2.6 and 3.1 when the key name was exactly 256
+ # characters, EnumKey threw "WindowsError: More data is
+ # available"
+ name = 'x'*256
+ try:
+ with CreateKey(HKEY_CURRENT_USER, test_key_name) as key:
+ SetValue(key, name, REG_SZ, 'x')
+ num_subkeys, num_values, t = QueryInfoKey(key)
+ EnumKey(key, 0)
+ finally:
+ DeleteKey(HKEY_CURRENT_USER, '\\'.join((test_key_name, name)))
+ DeleteKey(HKEY_CURRENT_USER, test_key_name)
+
+ def test_dynamic_key(self):
+ # Issue2810, when the value is dynamically generated, these
+ # throw "WindowsError: More data is available" in 2.6 and 3.1
+ EnumValue(HKEY_PERFORMANCE_DATA, 0)
+ QueryValueEx(HKEY_PERFORMANCE_DATA, "")
+
+
def test_main():
support.run_unittest(WinregTests)