From 67af7f4eee2dafe205dfe9c899e8c335a1405d7e Mon Sep 17 00:00:00 2001 From: Hirokazu Yamamoto Date: Mon, 13 Sep 2010 07:48:22 +0000 Subject: [PATCH] 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. ........ --- Lib/distutils/tests/test_msvc9compiler.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/distutils/tests/test_msvc9compiler.py b/Lib/distutils/tests/test_msvc9compiler.py index ec2b2e367a..f1da843fab 100644 --- a/Lib/distutils/tests/test_msvc9compiler.py +++ b/Lib/distutils/tests/test_msvc9compiler.py @@ -62,10 +62,14 @@ _CLEANED_MANIFEST = """\ if sys.platform=="win32": from distutils.msvccompiler import get_build_version - -@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32") -@unittest.skipUnless(get_build_version()>=8.0, "These tests are only for" - " MSVC8.0 or above") + 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" + +@unittest.skipUnless(SKIP_MESSAGE is None, SKIP_MESSAGE) class msvc9compilerTestCase(support.TempdirManager, unittest.TestCase): -- 2.40.0