[Python-checkins] cpython (3.3): Issue #19492: Silently skipped distutils tests now reported as skipped.
serhiy.storchaka
python-checkins at python.org
Wed Dec 18 15:48:42 CET 2013
http://hg.python.org/cpython/rev/b3f3e6afe966
changeset: 88039:b3f3e6afe966
branch: 3.3
parent: 88036:b0fbaed45956
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Dec 18 16:41:01 2013 +0200
summary:
Issue #19492: Silently skipped distutils tests now reported as skipped.
files:
Lib/distutils/tests/test_bdist_rpm.py | 40 ++++------
Lib/distutils/tests/test_build_clib.py | 7 +-
Lib/distutils/tests/test_build_ext.py | 8 +-
Lib/distutils/tests/test_check.py | 6 +-
Lib/distutils/tests/test_config_cmd.py | 3 +-
Lib/distutils/tests/test_sdist.py | 10 +-
Lib/distutils/tests/test_sysconfig.py | 9 +-
Lib/distutils/tests/test_unixccompiler.py | 6 +-
8 files changed, 32 insertions(+), 57 deletions(-)
diff --git a/Lib/distutils/tests/test_bdist_rpm.py b/Lib/distutils/tests/test_bdist_rpm.py
--- a/Lib/distutils/tests/test_bdist_rpm.py
+++ b/Lib/distutils/tests/test_bdist_rpm.py
@@ -43,18 +43,15 @@
sys.argv[:] = self.old_sys_argv[1]
super(BuildRpmTestCase, self).tearDown()
+ # XXX I am unable yet to make this test work without
+ # spurious sdtout/stderr output under Mac OS X
+ @unittest.skipUnless(sys.platform.startswith('linux'),
+ 'spurious sdtout/stderr output under Mac OS X')
+ @unittest.skipIf(find_executable('rpm') is None,
+ 'the rpm command is not found')
+ @unittest.skipIf(find_executable('rpmbuild') is None,
+ 'the rpmbuild command is not found')
def test_quiet(self):
-
- # XXX I am unable yet to make this test work without
- # spurious sdtout/stderr output under Mac OS X
- if not sys.platform.startswith('linux'):
- return
-
- # this test will run only if the rpm commands are found
- if (find_executable('rpm') is None or
- find_executable('rpmbuild') is None):
- return
-
# let's create a package
tmp_dir = self.mkdtemp()
pkg_dir = os.path.join(tmp_dir, 'foo')
@@ -87,19 +84,16 @@
self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files)
+ # XXX I am unable yet to make this test work without
+ # spurious sdtout/stderr output under Mac OS X
+ @unittest.skipUnless(sys.platform.startswith('linux'),
+ 'spurious sdtout/stderr output under Mac OS X')
+ # http://bugs.python.org/issue1533164
+ @unittest.skipIf(find_executable('rpm') is None,
+ 'the rpm command is not found')
+ @unittest.skipIf(find_executable('rpmbuild') is None,
+ 'the rpmbuild command is not found')
def test_no_optimize_flag(self):
-
- # XXX I am unable yet to make this test work without
- # spurious sdtout/stderr output under Mac OS X
- if not sys.platform.startswith('linux'):
- return
-
- # http://bugs.python.org/issue1533164
- # this test will run only if the rpm command is found
- if (find_executable('rpm') is None or
- find_executable('rpmbuild') is None):
- return
-
# let's create a package that brakes bdist_rpm
tmp_dir = self.mkdtemp()
pkg_dir = os.path.join(tmp_dir, 'foo')
diff --git a/Lib/distutils/tests/test_build_clib.py b/Lib/distutils/tests/test_build_clib.py
--- a/Lib/distutils/tests/test_build_clib.py
+++ b/Lib/distutils/tests/test_build_clib.py
@@ -102,11 +102,8 @@
cmd.distribution.libraries = 'WONTWORK'
self.assertRaises(DistutilsSetupError, cmd.finalize_options)
+ @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
def test_run(self):
- # can't test on windows
- if sys.platform == 'win32':
- return
-
pkg_dir, dist = self.create_dist()
cmd = build_clib(dist)
@@ -131,7 +128,7 @@
if ccmd is None:
continue
if find_executable(ccmd[0]) is None:
- return # can't test
+ self.skipTest('The %r command is not found' % ccmd[0])
# this should work
cmd.run()
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -61,9 +61,9 @@
sys.stdout = old_stdout
if ALREADY_TESTED:
- return
+ self.skipTest('Already tested in %s' % ALREADY_TESTED)
else:
- ALREADY_TESTED = True
+ ALREADY_TESTED = type(self).__name__
import xx
@@ -113,10 +113,6 @@
self.assertGreater(len(cmd.library_dirs), 0)
def test_user_site(self):
- # site.USER_SITE was introduced in 2.6
- if sys.version < '2.6':
- return
-
import site
dist = Distribution({'name': 'xx'})
cmd = build_ext(dist)
diff --git a/Lib/distutils/tests/test_check.py b/Lib/distutils/tests/test_check.py
--- a/Lib/distutils/tests/test_check.py
+++ b/Lib/distutils/tests/test_check.py
@@ -55,9 +55,8 @@
cmd = self._run(metadata)
self.assertEqual(cmd._warnings, 0)
+ @unittest.skipUnless(HAS_DOCUTILS, "won't test without docutils")
def test_check_document(self):
- if not HAS_DOCUTILS: # won't test without docutils
- return
pkg_info, dist = self.create_dist()
cmd = check(dist)
@@ -71,9 +70,8 @@
msgs = cmd._check_rst_data(rest)
self.assertEqual(len(msgs), 0)
+ @unittest.skipUnless(HAS_DOCUTILS, "won't test without docutils")
def test_check_restructuredtext(self):
- if not HAS_DOCUTILS: # won't test without docutils
- return
# let's see if it detects broken rest in long_description
broken_rest = 'title\n===\n\ntest'
pkg_info, dist = self.create_dist(long_description=broken_rest)
diff --git a/Lib/distutils/tests/test_config_cmd.py b/Lib/distutils/tests/test_config_cmd.py
--- a/Lib/distutils/tests/test_config_cmd.py
+++ b/Lib/distutils/tests/test_config_cmd.py
@@ -37,9 +37,8 @@
dump_file(this_file, 'I am the header')
self.assertEqual(len(self._logs), numlines+1)
+ @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
def test_search_cpp(self):
- if sys.platform == 'win32':
- return
pkg_dir, dist = self.create_dist()
cmd = config(dist)
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -125,13 +125,11 @@
self.assertEqual(len(content), 4)
@unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
+ @unittest.skipIf(find_executable('tar') is None,
+ "The tar command is not found")
+ @unittest.skipIf(find_executable('gzip') is None,
+ "The gzip command is not found")
def test_make_distribution(self):
-
- # check if tar and gzip are installed
- if (find_executable('tar') is None or
- find_executable('gzip') is None):
- return
-
# now building a sdist
dist, cmd = self.get_cmd()
diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py
--- a/Lib/distutils/tests/test_sysconfig.py
+++ b/Lib/distutils/tests/test_sysconfig.py
@@ -82,12 +82,9 @@
os.chdir(cwd)
self.assertEqual(srcdir, srcdir2)
+ @unittest.skipUnless(get_default_compiler() == 'unix',
+ 'not testing if default compiler is not unix')
def test_customize_compiler(self):
-
- # not testing if default compiler is not unix
- if get_default_compiler() != 'unix':
- return
-
os.environ['AR'] = 'my_ar'
os.environ['ARFLAGS'] = '-arflags'
@@ -150,7 +147,7 @@
import sysconfig as global_sysconfig
if sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'):
- return
+ self.skipTest('compiler flags customized')
self.assertEqual(global_sysconfig.get_config_var('LDSHARED'), sysconfig.get_config_var('LDSHARED'))
self.assertEqual(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC'))
diff --git a/Lib/distutils/tests/test_unixccompiler.py b/Lib/distutils/tests/test_unixccompiler.py
--- a/Lib/distutils/tests/test_unixccompiler.py
+++ b/Lib/distutils/tests/test_unixccompiler.py
@@ -21,12 +21,8 @@
sys.platform = self._backup_platform
sysconfig.get_config_var = self._backup_get_config_var
+ @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
def test_runtime_libdir_option(self):
-
- # not tested under windows
- if sys.platform == 'win32':
- return
-
# Issue#5900
#
# Ensure RUNPATH is added to extension modules with RPATH if
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list