From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Thu, 28 May 2009 14:02:58 +0000 (+0000)
Subject: Merged revisions 72986 via svnmerge from
X-Git-Tag: v3.1rc1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2cedaadb572c1bd58553ef5e27af0efc890d9b8;p=python

Merged revisions 72986 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72986 | tarek.ziade | 2009-05-28 15:55:51 +0200 (Thu, 28 May 2009) | 1 line

  using 'tar' then 'gzip' in the test, because 'tar -czf' is not supported under some platforms
........
---

diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py
index 5db9a5d096..663b33532a 100644
--- a/Lib/distutils/tests/test_archive_util.py
+++ b/Lib/distutils/tests/test_archive_util.py
@@ -20,6 +20,7 @@ except ImportError:
     ZIP_SUPPORT = find_executable('zip')
 
 class ArchiveUtilTestCase(support.TempdirManager,
+                          support.LoggingSilencer,
                           unittest.TestCase):
 
     def test_make_tarball(self):
@@ -82,7 +83,8 @@ class ArchiveUtilTestCase(support.TempdirManager,
         base_name = os.path.join(tmpdir2, 'archive')
         return tmpdir, tmpdir2, base_name
 
-    @unittest.skipUnless(find_executable('tar'), 'Need the tar command to run')
+    @unittest.skipUnless(find_executable('tar') and find_executable('gzip'),
+                         'Need the tar command to run')
     def test_tarfile_vs_tar(self):
         tmpdir, tmpdir2, base_name =  self._create_files()
         old_dir = os.getcwd()
@@ -98,11 +100,13 @@ class ArchiveUtilTestCase(support.TempdirManager,
 
         # now create another tarball using `tar`
         tarball2 = os.path.join(tmpdir, 'archive2.tar.gz')
-        cmd = ['tar', '-czf', 'archive2.tar.gz', 'dist']
+        tar_cmd = ['tar', '-cf', 'archive2.tar', 'dist']
+        gzip_cmd = ['gzip', '-f9', 'archive2.tar']
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:
-            spawn(cmd)
+            spawn(tar_cmd)
+            spawn(gzip_cmd)
         finally:
             os.chdir(old_dir)