mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-09 18:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #9313: Use unittest.skipUnless to skip old MSVC.

Browse source
This commit is contained in:
Hirokazu Yamamoto 2010-09-13 05:36:21 +00:00
parent a87b383ac1
commit 68201bdb6d
1 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/distutils/tests/test_msvc9compiler.py
View file

@ -60,7 +60,12 @@ _CLEANED_MANIFEST = """\
</dependency> </dependency>
</assembly>""" </assembly>"""
if sys.platform=="win32":
from distutils.msvccompiler import get_build_version
@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32") @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")
class msvc9compilerTestCase(support.TempdirManager, class msvc9compilerTestCase(support.TempdirManager,
unittest.TestCase): unittest.TestCase):
@ -68,10 +73,6 @@ class msvc9compilerTestCase(support.TempdirManager,
# makes sure query_vcvarsall throws # makes sure query_vcvarsall throws
# a DistutilsPlatformError if the compiler # a DistutilsPlatformError if the compiler
# is not found # is not found
from distutils.msvccompiler import get_build_version
if get_build_version() < 8.0:
# this test is only for MSVC8.0 or above
return
from distutils.msvc9compiler import query_vcvarsall from distutils.msvc9compiler import query_vcvarsall
def _find_vcvarsall(version): def _find_vcvarsall(version):
return None return None
@ -86,11 +87,6 @@ class msvc9compilerTestCase(support.TempdirManager,
msvc9compiler.find_vcvarsall = old_find_vcvarsall msvc9compiler.find_vcvarsall = old_find_vcvarsall
def test_reg_class(self): def test_reg_class(self):
from distutils.msvccompiler import get_build_version
if get_build_version() < 8.0:
# this test is only for MSVC8.0 or above
return
from distutils.msvc9compiler import Reg from distutils.msvc9compiler import Reg
self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx') self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx')
@ -109,11 +105,6 @@ class msvc9compilerTestCase(support.TempdirManager,
self.assertTrue('Desktop' in keys) self.assertTrue('Desktop' in keys)
def test_remove_visual_c_ref(self): def test_remove_visual_c_ref(self):
from distutils.msvccompiler import get_build_version
if get_build_version() < 8.0:
# this test is only for MSVC8.0 or above
return
from distutils.msvc9compiler import MSVCCompiler from distutils.msvc9compiler import MSVCCompiler
tempdir = self.mkdtemp() tempdir = self.mkdtemp()
manifest = os.path.join(tempdir, 'manifest') manifest = os.path.join(tempdir, 'manifest')