mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Refactor a few tests to use the new requires_zlib decorator.

Browse source
This commit is contained in:
Ezio Melotti 2011-05-19 22:03:22 +03:00
parent cad648cbc9
commit 975077a889
5 changed files with 49 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/test/test_shutil.py
View file

@ -21,7 +21,7 @@ import tarfile
import warnings
from test import support
from test.support import TESTFN, check_warnings, captured_stdout
from test.support import TESTFN, check_warnings, captured_stdout, requires_zlib
try:
import bz2
@ -38,11 +38,6 @@ try:
except ImportError:
UID_GID_SUPPORT = False
try:
import zlib
except ImportError:
zlib = None
try:
import zipfile
ZIP_SUPPORT = True
@ -444,7 +439,7 @@ class TestShutil(unittest.TestCase):
self.assertEqual(getattr(file1_stat, 'st_flags'),
getattr(file2_stat, 'st_flags'))
@unittest.skipUnless(zlib, "requires zlib")
@requires_zlib
def test_make_tarball(self):
# creating something to tar
tmpdir = self.mkdtemp()
@ -507,7 +502,7 @@ class TestShutil(unittest.TestCase):
base_name = os.path.join(tmpdir2, 'archive')
return tmpdir, tmpdir2, base_name
@unittest.skipUnless(zlib, "Requires zlib")
@requires_zlib
@unittest.skipUnless(find_executable('tar') and find_executable('gzip'),
'Need the tar command to run')
def test_tarfile_vs_tar(self):
@ -562,7 +557,7 @@ class TestShutil(unittest.TestCase):
tarball = base_name + '.tar'
self.assertTrue(os.path.exists(tarball))
@unittest.skipUnless(zlib, "Requires zlib")
@requires_zlib
@unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
def test_make_zipfile(self):
# creating something to tar
@ -586,7 +581,7 @@ class TestShutil(unittest.TestCase):
base_name = os.path.join(tmpdir, 'archive')
self.assertRaises(ValueError, make_archive, base_name, 'xxx')
@unittest.skipUnless(zlib, "Requires zlib")
@requires_zlib
def test_make_archive_owner_group(self):
# testing make_archive with owner and group, with various combinations
# this works even if there's not gid/uid support
@ -614,7 +609,7 @@ class TestShutil(unittest.TestCase):
self.assertTrue(os.path.exists(res))
@unittest.skipUnless(zlib, "Requires zlib")
@requires_zlib
@unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
def test_tarfile_root_owner(self):
tmpdir, tmpdir2, base_name = self._create_files()
@ -683,7 +678,7 @@ class TestShutil(unittest.TestCase):
diff.append(file_)
return diff
@unittest.skipUnless(zlib, "Requires zlib")
@requires_zlib
def test_unpack_archive(self):
formats = ['tar', 'gztar', 'zip']
if BZ2_SUPPORTED: