Commit 3917b17a authored by Tarek Ziadé's avatar Tarek Ziadé

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

parent 8488006f
...@@ -20,6 +20,7 @@ except ImportError: ...@@ -20,6 +20,7 @@ except ImportError:
ZIP_SUPPORT = find_executable('zip') ZIP_SUPPORT = find_executable('zip')
class ArchiveUtilTestCase(support.TempdirManager, class ArchiveUtilTestCase(support.TempdirManager,
support.LoggingSilencer,
unittest.TestCase): unittest.TestCase):
def test_make_tarball(self): def test_make_tarball(self):
...@@ -82,7 +83,8 @@ class ArchiveUtilTestCase(support.TempdirManager, ...@@ -82,7 +83,8 @@ class ArchiveUtilTestCase(support.TempdirManager,
base_name = os.path.join(tmpdir2, 'archive') base_name = os.path.join(tmpdir2, 'archive')
return tmpdir, tmpdir2, base_name 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): def test_tarfile_vs_tar(self):
tmpdir, tmpdir2, base_name = self._create_files() tmpdir, tmpdir2, base_name = self._create_files()
old_dir = os.getcwd() old_dir = os.getcwd()
...@@ -98,11 +100,13 @@ class ArchiveUtilTestCase(support.TempdirManager, ...@@ -98,11 +100,13 @@ class ArchiveUtilTestCase(support.TempdirManager,
# now create another tarball using `tar` # now create another tarball using `tar`
tarball2 = os.path.join(tmpdir, 'archive2.tar.gz') 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() old_dir = os.getcwd()
os.chdir(tmpdir) os.chdir(tmpdir)
try: try:
spawn(cmd) spawn(tar_cmd)
spawn(gzip_cmd)
finally: finally:
os.chdir(old_dir) os.chdir(old_dir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment