[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2

[ross.lagerwall]

http://hg.python.org/cpython/rev/cdffe73e3218
changeset:   69216:cdffe73e3218
parent:      69212:64de1ded0744
parent:      69215:677e9a9beac2
user:        Ross Lagerwall <rosslagerwall at gmail.com>
date:        Sat Apr 09 20:12:43 2011 +0200
summary:
  Merge with 3.2

files:
  Lib/test/regrtest.py |  2 +-
  Misc/NEWS            |  3 +++
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1530,7 +1530,7 @@
                 # 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -403,6 +403,9 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython