From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 18 Dec 2013 14:45:24 +0000 (+0200)
Subject: Issue #19492: Silently skipped distutils tests now reported as skipped.
X-Git-Tag: v3.4.0b2~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f5f436680248d42dafa1d69119ae7c6b434a2c9;p=thirdparty%2FPython%2Fcpython.git

Issue #19492: Silently skipped distutils tests now reported as skipped.
---

3f5f436680248d42dafa1d69119ae7c6b434a2c9
diff --cc Lib/distutils/tests/test_sdist.py
index 164586b7846c,c9524061318f..49e267e20aa1
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@@ -431,56 -423,6 +429,54 @@@ class SDistTestCase(PyPIRCCommandTestCa
          self.assertEqual(sorted(filenames), ['fake-1.0', 'fake-1.0/PKG-INFO',
                                               'fake-1.0/README.manual'])
  
 +    @unittest.skipUnless(zlib, "requires zlib")
 +    @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
++    @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_owner_group(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()
 +
 +        # creating a gztar and specifying the owner+group
 +        cmd.formats = ['gztar']
 +        cmd.owner = pwd.getpwuid(0)[0]
 +        cmd.group = grp.getgrgid(0)[0]
 +        cmd.ensure_finalized()
 +        cmd.run()
 +
 +        # making sure we have the good rights
 +        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
 +        archive = tarfile.open(archive_name)
 +        try:
 +            for member in archive.getmembers():
 +                self.assertEqual(member.uid, 0)
 +                self.assertEqual(member.gid, 0)
 +        finally:
 +            archive.close()
 +
 +        # building a sdist again
 +        dist, cmd = self.get_cmd()
 +
 +        # creating a gztar
 +        cmd.formats = ['gztar']
 +        cmd.ensure_finalized()
 +        cmd.run()
 +
 +        # making sure we have the good rights
 +        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
 +        archive = tarfile.open(archive_name)
 +
 +        # note that we are not testing the group ownership here
 +        # because, depending on the platforms and the container
 +        # rights (see #7408)
 +        try:
 +            for member in archive.getmembers():
 +                self.assertEqual(member.uid, os.getuid())
 +        finally:
 +            archive.close()
 +
  def test_suite():
      return unittest.makeSuite(SDistTestCase)
  
diff --cc Lib/distutils/tests/test_sysconfig.py
index b5fdc98dc97f,a1cb47d87cd7..95fa9dc11122
--- a/Lib/distutils/tests/test_sysconfig.py
+++ b/Lib/distutils/tests/test_sysconfig.py
@@@ -151,31 -147,10 +148,31 @@@ class SysconfigTestCase(support.Environ
  
          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'))
 -
 +        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'))
 +
 +    @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
 +                     'EXT_SUFFIX required for this test')
 +    def test_SO_deprecation(self):
 +        self.assertWarns(DeprecationWarning,
 +                         sysconfig.get_config_var, 'SO')
 +
 +    @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
 +                     'EXT_SUFFIX required for this test')
 +    def test_SO_value(self):
 +        with check_warnings(('', DeprecationWarning)):
 +            self.assertEqual(sysconfig.get_config_var('SO'),
 +                             sysconfig.get_config_var('EXT_SUFFIX'))
 +
 +    @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
 +                     'EXT_SUFFIX required for this test')
 +    def test_SO_in_vars(self):
 +        vars = sysconfig.get_config_vars()
 +        self.assertIsNotNone(vars['SO'])
 +        self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
  
  
  def test_suite():