summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2011-04-09 18:05:04 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2011-04-09 18:05:04 (GMT)
commit226580e6dc46eab9c33b64a5635645686e5df57f (patch)
tree4e7f49adee6015a274ced2d3b2a931ee0880ed93
parenta870e35a7dff135a9c1075ab2ea068c9f7b2f379 (diff)
parente620d1070192ef85f2520e9f60cdbde2adb4d465 (diff)
downloadcpython-226580e6dc46eab9c33b64a5635645686e5df57f.zip
cpython-226580e6dc46eab9c33b64a5635645686e5df57f.tar.gz
cpython-226580e6dc46eab9c33b64a5635645686e5df57f.tar.bz2
Merge with 3.1
-rwxr-xr-xLib/test/regrtest.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index a18b7a2..89acb9b 100755
--- 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':
diff --git a/Misc/NEWS b/Misc/NEWS
index 39faa4b..23026db 100644
--- 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.