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

[ross.lagerwall]

http://hg.python.org/cpython/rev/677e9a9beac2
changeset:   69215:677e9a9beac2
branch:      3.2
parent:      69211:fc2f251e660a
parent:      69214:d4730f14b6c0
user:        Ross Lagerwall <rosslagerwall at gmail.com>
date:        Sat Apr 09 20:05:04 2011 +0200
summary:
  Merge with 3.1

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
@@ -1480,7 +1480,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
@@ -223,6 +223,9 @@
 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.

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