mirror of https://github.com/python/cpython
Merged revisions 84753,84760 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84753 | hirokazu.yamamoto | 2010-09-13 07:55:40 +0900 | 1 line Issue #9313: Skips test_remove_visual_c_ref on old MSVC. ........ r84760 | hirokazu.yamamoto | 2010-09-13 14:36:21 +0900 | 1 line Issue #9313: Use unittest.skipUnless to skip old MSVC. ........
This commit is contained in:
parent
78b1bf3664
commit
f994f04745
|
@ -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')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue