diff -r 627e024fc17c Lib/distutils/tests/test_bdist_rpm.py --- a/Lib/distutils/tests/test_bdist_rpm.py Mon Nov 04 07:46:23 2013 +0100 +++ b/Lib/distutils/tests/test_bdist_rpm.py Mon Nov 04 14:49:27 2013 +0200 @@ -43,18 +43,14 @@ 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 or + find_executable('rpmbuild') is None, + 'the rpm commands are 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 +83,15 @@ 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 or + find_executable('rpmbuild') is None, + 'the rpm commands are 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 -r 627e024fc17c Lib/distutils/tests/test_build_clib.py --- a/Lib/distutils/tests/test_build_clib.py Mon Nov 04 07:46:23 2013 +0100 +++ b/Lib/distutils/tests/test_build_clib.py Mon Nov 04 14:49:27 2013 +0200 @@ -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 %s command is not found' % ccmd[0]) # this should work cmd.run() diff -r 627e024fc17c Lib/distutils/tests/test_build_ext.py --- a/Lib/distutils/tests/test_build_ext.py Mon Nov 04 07:46:23 2013 +0100 +++ b/Lib/distutils/tests/test_build_ext.py Mon Nov 04 14:49:27 2013 +0200 @@ -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 @@ -112,11 +112,9 @@ # make sure we get some library dirs under solaris self.assertTrue(len(cmd.library_dirs) > 0) + @unittest.skipIf(sys.version < '2.6', + 'site.USER_SITE was introduced in 2.6') 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 -r 627e024fc17c Lib/distutils/tests/test_check.py --- a/Lib/distutils/tests/test_check.py Mon Nov 04 07:46:23 2013 +0100 +++ b/Lib/distutils/tests/test_check.py Mon Nov 04 14:49:27 2013 +0200 @@ -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 -r 627e024fc17c Lib/distutils/tests/test_config_cmd.py --- a/Lib/distutils/tests/test_config_cmd.py Mon Nov 04 07:46:23 2013 +0100 +++ b/Lib/distutils/tests/test_config_cmd.py Mon Nov 04 14:49:27 2013 +0200 @@ -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 -r 627e024fc17c Lib/distutils/tests/test_sdist.py --- a/Lib/distutils/tests/test_sdist.py Mon Nov 04 07:46:23 2013 +0100 +++ b/Lib/distutils/tests/test_sdist.py Mon Nov 04 14:49:27 2013 +0200 @@ -125,13 +125,9 @@ self.assertEqual(len(content), 4) @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run') + @unittest.skipIf(find_executable('tar') is None, "tar isn't installed") + @unittest.skipIf(find_executable('gzip') is None, "gzip isn't installed") 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 -r 627e024fc17c Lib/distutils/tests/test_sysconfig.py --- a/Lib/distutils/tests/test_sysconfig.py Mon Nov 04 07:46:23 2013 +0100 +++ b/Lib/distutils/tests/test_sysconfig.py Mon Nov 04 14:49:27 2013 +0200 @@ -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 -r 627e024fc17c Lib/distutils/tests/test_unixccompiler.py --- a/Lib/distutils/tests/test_unixccompiler.py Mon Nov 04 07:46:23 2013 +0100 +++ b/Lib/distutils/tests/test_unixccompiler.py Mon Nov 04 14:49:27 2013 +0200 @@ -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