1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #25686: test_shutil no longer uses the distutils package for searching

Browse Source 
and running external archivers.
This commit is contained in:
Serhiy Storchaka 2015-11-21 14:09:26 +02:00
parent e1b02e0459
commit b42de2f309
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/test/test_shutil.py
View File

@ -12,8 +12,6 @@ import errno
import functools import functools
import subprocess import subprocess
from contextlib import ExitStack from contextlib import ExitStack
from os.path import splitdrive
from distutils.spawn import find_executable, spawn
from shutil import (make_archive, from shutil import (make_archive,
register_archive_format, unregister_archive_format, register_archive_format, unregister_archive_format,
get_archive_formats, Error, unpack_archive, get_archive_formats, Error, unpack_archive,
@ -45,7 +43,7 @@ try:
import zipfile import zipfile
ZIP_SUPPORT = True ZIP_SUPPORT = True
except ImportError: except ImportError:
ZIP_SUPPORT = find_executable('zip') ZIP_SUPPORT = shutil.which('zip')
def _fake_rename(*args, **kwargs): def _fake_rename(*args, **kwargs):
# Pretend the destination path is on a different filesystem. # Pretend the destination path is on a different filesystem.
@ -1017,7 +1015,7 @@ class TestShutil(unittest.TestCase):
return root_dir, base_dir return root_dir, base_dir
@requires_zlib @requires_zlib
@unittest.skipUnless(find_executable('tar'), @unittest.skipUnless(shutil.which('tar'),
'Need the tar command to run') 'Need the tar command to run')
def test_tarfile_vs_tar(self): def test_tarfile_vs_tar(self):
root_dir, base_dir = self._create_files() root_dir, base_dir = self._create_files()
@ -1031,8 +1029,8 @@ class TestShutil(unittest.TestCase):
# now create another tarball using `tar` # now create another tarball using `tar`
tarball2 = os.path.join(root_dir, 'archive2.tar') tarball2 = os.path.join(root_dir, 'archive2.tar')
tar_cmd = ['tar', '-cf', 'archive2.tar', base_dir] tar_cmd = ['tar', '-cf', 'archive2.tar', base_dir]
with support.change_cwd(root_dir): subprocess.check_call(tar_cmd, cwd=root_dir,
spawn(tar_cmd) stdout=subprocess.DEVNULL)
self.assertTrue(os.path.isfile(tarball2)) self.assertTrue(os.path.isfile(tarball2))
# let's compare both tarballs # let's compare both tarballs
@ -1076,7 +1074,7 @@ class TestShutil(unittest.TestCase):
@requires_zlib @requires_zlib
@unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run') @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
@unittest.skipUnless(find_executable('zip'), @unittest.skipUnless(shutil.which('zip'),
'Need the zip command to run') 'Need the zip command to run')
def test_zipfile_vs_zip(self): def test_zipfile_vs_zip(self):
root_dir, base_dir = self._create_files() root_dir, base_dir = self._create_files()
@ -1090,8 +1088,8 @@ class TestShutil(unittest.TestCase):
# now create another ZIP file using `zip` # now create another ZIP file using `zip`
archive2 = os.path.join(root_dir, 'archive2.zip') archive2 = os.path.join(root_dir, 'archive2.zip')
zip_cmd = ['zip', '-q', '-r', 'archive2.zip', base_dir] zip_cmd = ['zip', '-q', '-r', 'archive2.zip', base_dir]
with support.change_cwd(root_dir): subprocess.check_call(zip_cmd, cwd=root_dir,
spawn(zip_cmd) stdout=subprocess.DEVNULL)
self.assertTrue(os.path.isfile(archive2)) self.assertTrue(os.path.isfile(archive2))
# let's compare both ZIP files # let's compare both ZIP files