Merge with 3.1

2011-04-09 20:05:04 +02:00 · 2011-04-09 20:05:04 +02:00 · 226580e6dc
parent a870e35a7d e620d10701
commit 226580e6dc
2 changed files with 4 additions and 1 deletions
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@ -1480,7 +1480,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
@ -223,6 +223,9 @@ Extensions
 Tests
 -----

+- Issue #11719: Fix message about unexpected test_msilib skip on non-Windows
+  platforms. Patch by Nadeem Vawda.
+
 - Issue #11653: fix -W with -j in regrtest.

 - Issue #11577: improve test coverage of binhex.py. Patch by Arkady Koplyarov.