[Python-checkins] r84770 - in python/branches/release27-maint: Lib/distutils/tests/test_msvc9compiler.py

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Mon Sep 13 10:14:41 2010
New Revision: 84770

Log:
Merged revisions 84765 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84765 | hirokazu.yamamoto | 2010-09-13 16:18:30 +0900 | 2 lines
  
  get_build_version() is needed even where sys.platform != "win32".
  Try to fix buildbot error in other way.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/distutils/tests/test_msvc9compiler.py

Modified: python/branches/release27-maint/Lib/distutils/tests/test_msvc9compiler.py
==============================================================================
--- python/branches/release27-maint/Lib/distutils/tests/test_msvc9compiler.py	(original)
+++ python/branches/release27-maint/Lib/distutils/tests/test_msvc9compiler.py	Mon Sep 13 10:14:41 2010
@@ -62,10 +62,14 @@
 
 if sys.platform=="win32":
     from distutils.msvccompiler import get_build_version
+    if get_build_version()>=8.0:
+        SKIP_MESSAGE = None
+    else:
+        SKIP_MESSAGE = "These tests are only for MSVC8.0 or above"
+else:
+    SKIP_MESSAGE = "These tests are only for win32"
 
- at unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
- at unittest.skipUnless(get_build_version()>=8.0, "These tests are only for"
-                                               " MSVC8.0 or above")
+ at unittest.skipUnless(SKIP_MESSAGE is None, SKIP_MESSAGE)
 class msvc9compilerTestCase(support.TempdirManager,
                             unittest.TestCase):