summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2011-04-09 18:12:43 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2011-04-09 18:12:43 (GMT)
commitb2a290c329624a3c73203f0775882086f0853d8a (patch)
tree19b90ba0c24c78cc42af7c70820b6d2f964aa8e8
parent4ae3b447c80a6c59ca908c7475c6b29af87e57f5 (diff)
parent226580e6dc46eab9c33b64a5635645686e5df57f (diff)
downloadcpython-b2a290c329624a3c73203f0775882086f0853d8a.zip
cpython-b2a290c329624a3c73203f0775882086f0853d8a.tar.gz
cpython-b2a290c329624a3c73203f0775882086f0853d8a.tar.bz2
Merge with 3.2
-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 414aeff..a76492a 100755
--- 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':
diff --git a/Misc/NEWS b/Misc/NEWS
index eb632a8..a297985 100644
--- 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.