Merge with 3.2

2011-04-09 20:12:43 +02:00 · 2011-04-09 20:12:43 +02:00 · b2a290c329
parent 4ae3b447c8 226580e6dc
commit b2a290c329
2 changed files with 4 additions and 1 deletions
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@ -1530,7 +1530,7 @@ class _ExpectedSkips:
                # is distributed with Python
                WIN_ONLY = {"test_unicode_file", "test_winreg",
                            "test_winsound", "test_startfile",
-                            "test_sqlite"}
+                            "test_sqlite", "test_msilib"}
                self.expected |= WIN_ONLY

            if sys.platform != 'sunos5':
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -403,6 +403,9 @@ Extensions
 Tests
 -----

+- Issue #11719: Fix message about unexpected test_msilib skip on non-Windows
+  platforms. Patch by Nadeem Vawda.
+
 - Issue #11727: Add a --timeout option to regrtest: if a test takes more than
  TIMEOUT seconds, dumps the traceback of all threads and exits.