#7855: Add tests for ctypes/winreg for issues found in IronPython. Initial patch by Dino Viehland.
diff --git a/Lib/ctypes/test/__init__.py b/Lib/ctypes/test/__init__.py
index 5223092..808e418 100644
--- a/Lib/ctypes/test/__init__.py
+++ b/Lib/ctypes/test/__init__.py
@@ -62,7 +62,7 @@
continue
try:
mod = __import__(modname, globals(), locals(), ['*'])
- except ResourceDenied, detail:
+ except (ResourceDenied, unittest.SkipTest) as detail:
skipped.append(modname)
if verbosity > 1:
print >> sys.stderr, "Skipped %s: %s" % (modname, detail)
diff --git a/Lib/ctypes/test/test_wintypes.py b/Lib/ctypes/test/test_wintypes.py
new file mode 100644
index 0000000..806fcce
--- /dev/null
+++ b/Lib/ctypes/test/test_wintypes.py
@@ -0,0 +1,43 @@
+import sys
+import unittest
+
+if not sys.platform.startswith('win'):
+ raise unittest.SkipTest('Windows-only test')
+
+from ctypes import *
+from ctypes import wintypes
+
+class WinTypesTest(unittest.TestCase):
+ def test_variant_bool(self):
+ # reads 16-bits from memory, anything non-zero is True
+ for true_value in (1, 32767, 32768, 65535, 65537):
+ true = POINTER(c_int16)(c_int16(true_value))
+ value = cast(true, POINTER(wintypes.VARIANT_BOOL))
+ self.assertEqual(repr(value.contents), 'VARIANT_BOOL(True)')
+
+ vb = wintypes.VARIANT_BOOL()
+ self.assertIs(vb.value, False)
+ vb.value = True
+ self.assertIs(vb.value, True)
+ vb.value = true_value
+ self.assertIs(vb.value, True)
+
+ for false_value in (0, 65536, 262144, 2**33):
+ false = POINTER(c_int16)(c_int16(false_value))
+ value = cast(false, POINTER(wintypes.VARIANT_BOOL))
+ self.assertEqual(repr(value.contents), 'VARIANT_BOOL(False)')
+
+ # allow any bool conversion on assignment to value
+ for set_value in (65536, 262144, 2**33):
+ vb = wintypes.VARIANT_BOOL()
+ vb.value = set_value
+ self.assertIs(vb.value, True)
+
+ vb = wintypes.VARIANT_BOOL()
+ vb.value = [2, 3]
+ self.assertIs(vb.value, True)
+ vb.value = []
+ self.assertIs(vb.value, False)
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py
index 683938a..e05d040 100644
--- a/Lib/test/test_winreg.py
+++ b/Lib/test/test_winreg.py
@@ -442,6 +442,11 @@
DeleteKeyEx(HKEY_CURRENT_USER, test_reflect_key_name,
KEY_WOW64_32KEY, 0)
+ def test_exception_numbers(self):
+ with self.assertRaises(WindowsError) as ctx:
+ QueryValue(HKEY_CLASSES_ROOT, 'some_value_that_does_not_exist')
+
+ self.assertEqual(ctx.exception.errno, 2)
def test_main():
test_support.run_unittest(LocalWinregTests, RemoteWinregTests,
diff --git a/Misc/ACKS b/Misc/ACKS
index 9f50b4c..660f52c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1050,6 +1050,7 @@
Al Vezza
Jacques A. Vidrine
John Viega
+Dino Viehland
Kannan Vijayan
Kurt Vile
Norman Vine
diff --git a/Misc/NEWS b/Misc/NEWS
index f438794..628ad76 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,9 @@
Tests
-----
+- Issue #7855: Add tests for ctypes/winreg for issues found in IronPython.
+ Initial patch by Dino Viehland.
+
- Issue #17712: Fix test_gdb failures on Ubuntu 13.04.
- Issue #17065: Use process-unique key for winreg tests to avoid failures if