HA
/
patool
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests.

This commit is contained in:
Bastian Kleineidam 2012-05-25 21:22:40 +02:00
parent 58b9fdda58
commit 59a6975345
3 changed files with 143 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tests/__init__.py
View File

@ -22,7 +22,7 @@ import patoolib
# All text files have '42' as content. # All text files have '42' as content.
TextFileContent = '42' TextFileContent = '42'
class ContentSet: class Content:
"""The test archives have one of several set of content files. """The test archives have one of several set of content files.
The different content file sets have each a constant defined The different content file sets have each a constant defined
by this class. by this class.
@ -58,23 +58,26 @@ class ArchiveTest (unittest.TestCase):
self.archive_list(filename) self.archive_list(filename)
self.archive_test(filename) self.archive_test(filename)
if kwargs.get('singlefile'): if kwargs.get('singlefile'):
contents_default = ContentSet.Singlefile check_default = Content.Singlefile
else: else:
contents_default = ContentSet.Recursive check_default = Content.Recursive
contents = kwargs.get('contents', contents_default) check = kwargs.get('check', check_default)
self.archive_extract(filename, contents=contents) if 'check' in kwargs:
self.archive_create(filename, **kwargs) del kwargs['check']
self.archive_extract(filename, check=check)
if not kwargs.get('skip_create'):
self.archive_create(filename, **kwargs)
def archive_extract (self, filename, contents=ContentSet.Recursive): def archive_extract (self, filename, check=Content.Recursive):
"""Test archive extraction.""" """Test archive extraction."""
archive = os.path.join(datadir, filename) archive = os.path.join(datadir, filename)
self.assertTrue(os.path.isabs(archive), "archive path is not absolute: %r" % archive) self.assertTrue(os.path.isabs(archive), "archive path is not absolute: %r" % archive)
self._archive_extract(archive, contents) self._archive_extract(archive, check)
# archive name relative to tmpdir # archive name relative to tmpdir
relarchive = os.path.join("..", archive[len(basedir)+1:]) relarchive = os.path.join("..", archive[len(basedir)+1:])
self._archive_extract(relarchive, contents, verbose=True) self._archive_extract(relarchive, check, verbose=True)
def _archive_extract (self, archive, contents, verbose=False): def _archive_extract (self, archive, check, verbose=False):
# create a temporary directory for extraction # create a temporary directory for extraction
tmpdir = patoolib.util.tmpdir(dir=basedir) tmpdir = patoolib.util.tmpdir(dir=basedir)
try: try:
@ -84,20 +87,21 @@ class ArchiveTest (unittest.TestCase):
os.chdir(tmpdir) os.chdir(tmpdir)
try: try:
output = patoolib._handle_archive(archive, 'extract', program=self.program, verbose=verbose) output = patoolib._handle_archive(archive, 'extract', program=self.program, verbose=verbose)
self.check_extracted_archive(archive, output, contents) if check:
self.check_extracted_archive(archive, output, check)
finally: finally:
if olddir: if olddir:
os.chdir(olddir) os.chdir(olddir)
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)
def check_extracted_archive (self, archive, output, contents): def check_extracted_archive (self, archive, output, check):
if contents == ContentSet.Recursive: if check == Content.Recursive:
# outdir is the 't' directory of the archive # outdir is the 't' directory of the archive
self.assertEqual(output, 't') self.assertEqual(output, 't')
self.check_directory(output, 't') self.check_directory(output, 't')
txtfile = os.path.join(output, 't.txt') txtfile = os.path.join(output, 't.txt')
self.check_textfile(txtfile, 't.txt') self.check_textfile(txtfile, 't.txt')
elif contents == ContentSet.Singlefile: elif check == Content.Singlefile:
# a non-existing directory to ensure files do not exist in it # a non-existing directory to ensure files do not exist in it
ned = get_nonexisting_directory() ned = get_nonexisting_directory()
expected_output = os.path.basename(patoolib.util.get_single_outfile(ned, archive)) expected_output = os.path.basename(patoolib.util.get_single_outfile(ned, archive))
@ -124,8 +128,7 @@ class ArchiveTest (unittest.TestCase):
patoolib._handle_archive(archive, 'test', program=self.program) patoolib._handle_archive(archive, 'test', program=self.program)
patoolib._handle_archive(archive, 'test', program=self.program, verbose=True) patoolib._handle_archive(archive, 'test', program=self.program, verbose=True)
def archive_create (self, archive, srcfile=None, singlefile=False, def archive_create (self, archive, srcfile=None, singlefile=False):
format=None, compression=None, contents=None):
"""Test archive creation.""" """Test archive creation."""
# determine filename which is added to the archive # determine filename which is added to the archive
if srcfile is None: if srcfile is None:
@ -136,17 +139,12 @@ class ArchiveTest (unittest.TestCase):
os.chdir(datadir) os.chdir(datadir)
# The format and compression arguments are needed for creating # The format and compression arguments are needed for creating
# archives with unusual file extensions. # archives with unusual file extensions.
kwargs = dict( self._archive_create(archive, srcfile, program=self.program)
program=self.program,
format=format,
compression=compression,
)
self._archive_create(archive, srcfile, kwargs)
# create again in verbose mode # create again in verbose mode
kwargs['verbose'] = True self._archive_create(archive, srcfile, program=self.program,
self._archive_create(archive, srcfile, kwargs) verbose=True)
def _archive_create (self, archive, srcfile, kwargs): def _archive_create (self, archive, srcfile, **kwargs):
"""Create archive from filename.""" """Create archive from filename."""
self.assertFalse(os.path.isabs(srcfile)) self.assertFalse(os.path.isabs(srcfile))
self.assertTrue(os.path.exists(srcfile)) self.assertTrue(os.path.exists(srcfile))
@ -187,9 +185,12 @@ class ArchiveTest (unittest.TestCase):
return return
program = self.program program = self.program
# special case for programs that cannot extract what they create # special case for programs that cannot extract what they create
if self.program == 'lcab': if self.program == 'compress':
program = 'gzip'
elif self.program == 'zip':
program = 'unzip'
elif self.program == 'lcab':
program = 'cabextract' program = 'cabextract'
# XXX
tmpdir = patoolib.util.tmpdir(dir=basedir) tmpdir = patoolib.util.tmpdir(dir=basedir)
try: try:
olddir = os.getcwd() olddir = os.getcwd()
@ -198,8 +199,6 @@ class ArchiveTest (unittest.TestCase):
os.chdir(tmpdir) os.chdir(tmpdir)
try: try:
output = patoolib._handle_archive(archive, 'extract', program=program) output = patoolib._handle_archive(archive, 'extract', program=program)
print "XXX1", archive, tmpdir
print "XXX diff", srcfile, "with", output
res = patoolib.util.run([diff, "-urN", srcfile, output]) res = patoolib.util.run([diff, "-urN", srcfile, output])
self.assertEqual(res, 0) self.assertEqual(res, 0)
finally: finally:

66
tests/test_archives.py
View File

@ -13,7 +13,7 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from . import ArchiveTest, needs_os, needs_program, needs_codec, ContentSet from . import ArchiveTest, needs_os, needs_program, needs_codec, Content
class TestArchives (ArchiveTest): class TestArchives (ArchiveTest):
@ -158,28 +158,28 @@ class TestArchives (ArchiveTest):
@needs_program('bzip2') @needs_program('bzip2')
def test_bzip2 (self): def test_bzip2 (self):
self.program = 'bzip2' self.program = 'bzip2'
self.archive_extract('t.txt.bz2', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2', check=Content.Singlefile)
self.archive_test('t.txt.bz2') self.archive_test('t.txt.bz2')
self.archive_create('t.txt.bz2', singlefile=True) self.archive_create('t.txt.bz2', singlefile=True)
@needs_program('bzip2') @needs_program('bzip2')
def test_py_bz2 (self): def test_py_bz2 (self):
self.program = 'py_bz2' self.program = 'py_bz2'
self.archive_extract('t.txt.bz2', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2', check=Content.Singlefile)
# bzip2 is used to test the created archive # bzip2 is used to test the created archive
self.archive_create('t.txt.bz2', singlefile=True) self.archive_create('t.txt.bz2', singlefile=True)
@needs_program('pbzip2') @needs_program('pbzip2')
def test_pbzip2 (self): def test_pbzip2 (self):
self.program = 'pbzip2' self.program = 'pbzip2'
self.archive_extract('t.txt.bz2', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2', check=Content.Singlefile)
self.archive_test('t.txt.bz2') self.archive_test('t.txt.bz2')
self.archive_create('t.txt.bz2', singlefile=True) self.archive_create('t.txt.bz2', singlefile=True)
@needs_program('lbzip2') @needs_program('lbzip2')
def test_lbzip2 (self): def test_lbzip2 (self):
self.program = 'lbzip2' self.program = 'lbzip2'
self.archive_extract('t.txt.bz2', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2', check=Content.Singlefile)
self.archive_test('t.txt.bz2') self.archive_test('t.txt.bz2')
self.archive_create('t.txt.bz2', singlefile=True) self.archive_create('t.txt.bz2', singlefile=True)
@ -198,10 +198,10 @@ class TestArchives (ArchiveTest):
@needs_program('unzip') @needs_program('unzip')
def test_unzip (self): def test_unzip (self):
self.program = 'unzip' self.program = 'unzip'
self.archive_extract('t.zip', contents=None) self.archive_extract('t.zip', check=None)
self.archive_list('t.zip') self.archive_list('t.zip')
self.archive_test('t.zip') self.archive_test('t.zip')
self.archive_extract('t.jar', contents=None) self.archive_extract('t.jar', check=None)
self.archive_list('t.jar') self.archive_list('t.jar')
self.archive_test('t.jar') self.archive_test('t.jar')
@ -218,12 +218,12 @@ class TestArchives (ArchiveTest):
def test_gzip (self): def test_gzip (self):
self.program = 'gzip' self.program = 'gzip'
self.archive_commands('t.txt.gz', singlefile=True) self.archive_commands('t.txt.gz', singlefile=True)
self.archive_extract('t.txt.Z', contents=ContentSet.Singlefile) self.archive_extract('t.txt.Z', check=Content.Singlefile)
@needs_program('gzip') @needs_program('gzip')
def test_py_gzip (self): def test_py_gzip (self):
self.program = 'py_gzip' self.program = 'py_gzip'
self.archive_extract('t.txt.gz', contents=ContentSet.Singlefile) self.archive_extract('t.txt.gz', check=Content.Singlefile)
# gzip is used to test the created archive # gzip is used to test the created archive
self.archive_create('t.txt.gz', singlefile=True) self.archive_create('t.txt.gz', singlefile=True)
@ -235,7 +235,7 @@ class TestArchives (ArchiveTest):
@needs_program('uncompress.real') @needs_program('uncompress.real')
def test_uncompress (self): def test_uncompress (self):
self.program = 'uncompress.real' self.program = 'uncompress.real'
self.archive_extract('t.txt.Z', contents=ContentSet.Singlefile) self.archive_extract('t.txt.Z', check=Content.Singlefile)
@needs_program('compress') @needs_program('compress')
def test_compress (self): def test_compress (self):
@ -256,15 +256,15 @@ class TestArchives (ArchiveTest):
self.archive_list('t.cpio') self.archive_list('t.cpio')
self.archive_list('t.rpm') self.archive_list('t.rpm')
self.archive_list('t.deb') self.archive_list('t.deb')
self.archive_extract('t.txt.gz', contents=ContentSet.Singlefile) self.archive_extract('t.txt.gz', check=Content.Singlefile)
self.archive_extract('t.txt.bz2', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2', check=Content.Singlefile)
self.archive_extract('t.jar', contents=None) self.archive_extract('t.jar', check=None)
self.archive_extract('t.txt.Z', contents=ContentSet.Singlefile) self.archive_extract('t.txt.Z', check=Content.Singlefile)
self.archive_extract('t.cab') self.archive_extract('t.cab')
self.archive_extract('t.arj') self.archive_extract('t.arj')
self.archive_extract('t.cpio') self.archive_extract('t.cpio')
self.archive_extract('t.rpm', contents=None) self.archive_extract('t.rpm', check=None)
self.archive_extract('t.deb', contents=None) self.archive_extract('t.deb', check=None)
self.archive_test('t.txt.gz') self.archive_test('t.txt.gz')
self.archive_test('t.txt.bz2') self.archive_test('t.txt.bz2')
self.archive_test('t.jar') self.archive_test('t.jar')
@ -298,15 +298,15 @@ class TestArchives (ArchiveTest):
#self.archive_list('t.cpio') #self.archive_list('t.cpio')
self.archive_list('t.rpm') self.archive_list('t.rpm')
#self.archive_list('t.deb') #self.archive_list('t.deb')
self.archive_extract('t.txt.gz', contents=ContentSet.Singlefile) self.archive_extract('t.txt.gz', check=Content.Singlefile)
self.archive_extract('t.txt.bz2', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2', check=Content.Singlefile)
self.archive_extract('t.jar', contents=None) self.archive_extract('t.jar', check=None)
self.archive_extract('t.txt.Z', contents=ContentSet.Singlefile) self.archive_extract('t.txt.Z', check=Content.Singlefile)
self.archive_extract('t.cab') self.archive_extract('t.cab')
#self.archive_extract('t.arj') #self.archive_extract('t.arj')
#self.archive_extract('t.cpio') #self.archive_extract('t.cpio')
#self.archive_extract('t.rpm', contents=None) #self.archive_extract('t.rpm', check=None)
#self.archive_extract('t.deb', contents=None) #self.archive_extract('t.deb', check=None)
self.archive_test('t.txt.gz') self.archive_test('t.txt.gz')
self.archive_test('t.txt.bz2') self.archive_test('t.txt.bz2')
self.archive_test('t.jar') self.archive_test('t.jar')
@ -332,7 +332,7 @@ class TestArchives (ArchiveTest):
def test_cabextract (self): def test_cabextract (self):
self.program = 'cabextract' self.program = 'cabextract'
self.archive_list('t.cab') self.archive_list('t.cab')
self.archive_extract('t.cab', contents=None) self.archive_extract('t.cab', check=None)
@needs_program('orange') @needs_program('orange')
def test_orange (self): def test_orange (self):
@ -386,13 +386,13 @@ class TestArchives (ArchiveTest):
@needs_program('cpio') @needs_program('cpio')
def test_rpm_extract (self): def test_rpm_extract (self):
self.program = 'rpm2cpio' self.program = 'rpm2cpio'
self.archive_extract('t.rpm', contents=None) self.archive_extract('t.rpm', check=None)
@needs_program('dpkg-deb') @needs_program('dpkg-deb')
def test_dpkg (self): def test_dpkg (self):
self.program = 'dpkg' self.program = 'dpkg'
self.archive_list('t.deb') self.archive_list('t.deb')
self.archive_extract('t.deb', contents=None) self.archive_extract('t.deb', check=None)
self.archive_test('t.deb') self.archive_test('t.deb')
@needs_program('lzop') @needs_program('lzop')
@ -404,35 +404,35 @@ class TestArchives (ArchiveTest):
def test_lzma (self): def test_lzma (self):
self.program = 'lzma' self.program = 'lzma'
self.archive_test('t.txt.lzma') self.archive_test('t.txt.lzma')
self.archive_extract('t.txt.lzma', contents=ContentSet.Singlefile) self.archive_extract('t.txt.lzma', check=Content.Singlefile)
self.archive_create('t.txt.lzma', singlefile=True) self.archive_create('t.txt.lzma', singlefile=True)
@needs_program('lzip') @needs_program('lzip')
def test_lzip (self): def test_lzip (self):
self.program = 'lzip' self.program = 'lzip'
self.archive_test('t.txt.lz') self.archive_test('t.txt.lz')
self.archive_extract('t.txt.lz', contents=ContentSet.Singlefile) self.archive_extract('t.txt.lz', check=Content.Singlefile)
self.archive_create('t.txt.lz', singlefile=True) self.archive_create('t.txt.lz', singlefile=True)
@needs_program('clzip') @needs_program('clzip')
def test_clzip (self): def test_clzip (self):
self.program = 'clzip' self.program = 'clzip'
self.archive_test('t.txt.lz') self.archive_test('t.txt.lz')
self.archive_extract('t.txt.lz', contents=ContentSet.Singlefile) self.archive_extract('t.txt.lz', check=Content.Singlefile)
self.archive_create('t.txt.lz', singlefile=True) self.archive_create('t.txt.lz', singlefile=True)
@needs_program('plzip') @needs_program('plzip')
def test_plzip (self): def test_plzip (self):
self.program = 'plzip' self.program = 'plzip'
self.archive_test('t.txt.lz') self.archive_test('t.txt.lz')
self.archive_extract('t.txt.lz', contents=ContentSet.Singlefile) self.archive_extract('t.txt.lz', check=Content.Singlefile)
self.archive_create('t.txt.lz', singlefile=True) self.archive_create('t.txt.lz', singlefile=True)
@needs_program('pdlzip') @needs_program('pdlzip')
def test_pdlzip (self): def test_pdlzip (self):
self.program = 'pdlzip' self.program = 'pdlzip'
self.archive_test('t.txt.lz') self.archive_test('t.txt.lz')
self.archive_extract('t.txt.lz', contents=ContentSet.Singlefile) self.archive_extract('t.txt.lz', check=Content.Singlefile)
self.archive_create('t.txt.lz', singlefile=True) self.archive_create('t.txt.lz', singlefile=True)
@needs_program('unalz') @needs_program('unalz')
@ -498,19 +498,19 @@ class TestArchives (ArchiveTest):
@needs_program('mac') @needs_program('mac')
def test_mac (self): def test_mac (self):
self.program = 'mac' self.program = 'mac'
self.archive_extract('t.ape', contents=None) self.archive_extract('t.ape', check=None)
self.archive_test('t.ape') self.archive_test('t.ape')
self.archive_create('t.ape', srcfile="t.wav") self.archive_create('t.ape', srcfile="t.wav")
@needs_program('shorten') @needs_program('shorten')
def test_shorten (self): def test_shorten (self):
self.program = 'shorten' self.program = 'shorten'
self.archive_extract('t.shn', contents=None) self.archive_extract('t.shn', check=None)
self.archive_create('t.shn', srcfile="t.wav") self.archive_create('t.shn', srcfile="t.wav")
@needs_program('flac') @needs_program('flac')
def test_flac (self): def test_flac (self):
self.program = 'flac' self.program = 'flac'
self.archive_extract('t.flac', contents=None) self.archive_extract('t.flac', check=None)
self.archive_test('t.flac') self.archive_test('t.flac')
self.archive_create('t.flac', srcfile="t.wav") self.archive_create('t.flac', srcfile="t.wav")

199
tests/test_foo_archives.py
View File

@ -13,7 +13,7 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from tests import ArchiveTest, needs_os, needs_program, needs_codec, ContentSet from tests import ArchiveTest, needs_os, needs_program, needs_codec, Content
class TestArchives (ArchiveTest): class TestArchives (ArchiveTest):
@ -21,28 +21,28 @@ class TestArchives (ArchiveTest):
@needs_program('tar') @needs_program('tar')
def test_tar_file (self): def test_tar_file (self):
self.program = 'tar' self.program = 'tar'
self.archive_commands('t.tar.foo', format="tar") self.archive_commands('t.tar.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('tar', 'gzip') @needs_codec('tar', 'gzip')
def test_tar_gz_file (self): def test_tar_gz_file (self):
self.program = 'tar' self.program = 'tar'
self.archive_commands('t.tar.gz.foo', format="tar", compression="gzip") self.archive_commands('t.tar.gz.foo', skip_create=True)
self.archive_commands('t.tgz.foo', format="tar", compression="gzip") self.archive_commands('t.tgz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('tar', 'compress') @needs_codec('tar', 'compress')
def test_tar_z (self): def test_tar_z (self):
self.program = 'tar' self.program = 'tar'
self.archive_commands('t.tar.Z.foo', format="tar", compression="compress") self.archive_commands('t.tar.Z.foo', skip_create=True)
self.archive_commands('t.taz.foo', format="tar", compression="compress") self.archive_commands('t.taz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('tar', 'bzip2') @needs_codec('tar', 'bzip2')
def test_tar_bz2 (self): def test_tar_bz2 (self):
self.program = 'tar' self.program = 'tar'
self.archive_commands('t.tar.bz2.foo', format="tar", compression="bzip2") self.archive_commands('t.tar.bz2.foo', skip_create=True)
self.archive_commands('t.tbz2.foo', format="tar", compression="bzip2") self.archive_commands('t.tbz2.foo', skip_create=True)
# file(1) does not recognize .lzma files (at least not with --uncompress) # file(1) does not recognize .lzma files (at least not with --uncompress)
#@needs_program('file') #@needs_program('file')
@ -58,47 +58,47 @@ class TestArchives (ArchiveTest):
@needs_codec('tar', 'lzip') @needs_codec('tar', 'lzip')
def test_tar_lzip (self): def test_tar_lzip (self):
self.program = 'tar' self.program = 'tar'
self.archive_commands('t.tar.lz.foo', format="tar", compression="lzip") self.archive_commands('t.tar.lz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('tar', 'xz') @needs_codec('tar', 'xz')
def test_tar_xz (self): def test_tar_xz (self):
self.program = 'tar' self.program = 'tar'
self.archive_commands('t.tar.xz.foo', format="tar", compression="xz") self.archive_commands('t.tar.xz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_program('bsdtar') @needs_program('bsdtar')
def test_bsdtar_file (self): def test_bsdtar_file (self):
self.program = 'bsdtar' self.program = 'bsdtar'
self.archive_commands('t.tar.foo', format="tar") self.archive_commands('t.tar.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('bsdtar', 'gzip') @needs_codec('bsdtar', 'gzip')
def test_bsdtar_gz_file (self): def test_bsdtar_gz_file (self):
self.program = 'bsdtar' self.program = 'bsdtar'
self.archive_commands('t.tar.gz.foo', format="tar", compression="gzip") self.archive_commands('t.tar.gz.foo', skip_create=True)
self.archive_commands('t.tgz.foo', format="tar", compression="gzip") self.archive_commands('t.tgz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('bsdtar', 'compress') @needs_codec('bsdtar', 'compress')
def test_bsdtar_z (self): def test_bsdtar_z (self):
self.program = 'bsdtar' self.program = 'bsdtar'
self.archive_commands('t.tar.Z.foo', format="tar", compression="compress") self.archive_commands('t.tar.Z.foo', skip_create=True)
self.archive_commands('t.taz.foo', format="tar", compression="compress") self.archive_commands('t.taz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('bsdtar', 'bzip2') @needs_codec('bsdtar', 'bzip2')
def test_bsdtar_bz2 (self): def test_bsdtar_bz2 (self):
self.program = 'bsdtar' self.program = 'bsdtar'
self.archive_commands('t.tar.bz2.foo', format="tar", compression="bzip2") self.archive_commands('t.tar.bz2.foo', skip_create=True)
self.archive_commands('t.tbz2.foo', format="tar", compression="bzip2") self.archive_commands('t.tbz2.foo', skip_create=True)
# file(1) does not recognize .lzma files (at least not with --uncompress) # file(1) does not recognize .lzma files (at least not with --uncompress)
#@needs_program('file') #@needs_program('file')
#@needs_codec('bsdtar', 'lzma') #@needs_codec('bsdtar', 'lzma')
#def test_bsdtar_lzma (self): #def test_bsdtar_lzma (self):
# self.program = 'bsdtar' # self.program = 'bsdtar'
# self.archive_commands('t.tar.lzma.foo', format="tar", compression="lzma") # self.archive_commands('t.tar.lzma.foo', skip_create=True)
# even though clzip would support extracting .lz files, the # even though clzip would support extracting .lz files, the
# file(1) --uncompress command does not use it for achive detection # file(1) --uncompress command does not use it for achive detection
@ -107,106 +107,102 @@ class TestArchives (ArchiveTest):
@needs_codec('bsdtar', 'lzip') @needs_codec('bsdtar', 'lzip')
def test_bsdtar_lzip (self): def test_bsdtar_lzip (self):
self.program = 'bsdtar' self.program = 'bsdtar'
self.archive_commands('t.tar.lz.foo', format="tar", compression="lzip") self.archive_commands('t.tar.lz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('bsdtar', 'xz') @needs_codec('bsdtar', 'xz')
def test_bsdtar_xz (self): def test_bsdtar_xz (self):
self.program = 'bsdtar' self.program = 'bsdtar'
self.archive_commands('t.tar.xz.foo', format="tar", compression="xz") self.archive_commands('t.tar.xz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_program('star') @needs_program('star')
def test_star (self): def test_star (self):
self.program = 'star' self.program = 'star'
self.archive_commands('t.tar.foo', format="tar") self.archive_commands('t.tar.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('star', 'gzip') @needs_codec('star', 'gzip')
def test_star_gz (self): def test_star_gz (self):
self.program = 'star' self.program = 'star'
self.archive_commands('t.tar.gz.foo', format="tar", compression="gzip") self.archive_commands('t.tar.gz.foo', skip_create=True)
self.archive_commands('t.tgz.foo', format="tar", compression="gzip") self.archive_commands('t.tgz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('star', 'compress') @needs_codec('star', 'compress')
def test_star_z (self): def test_star_z (self):
self.program = 'star' self.program = 'star'
self.archive_commands('t.tar.Z.foo', format="tar", compression="compress") self.archive_commands('t.tar.Z.foo', skip_create=True)
self.archive_commands('t.taz.foo', format="tar", compression="compress") self.archive_commands('t.taz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('star', 'bzip2') @needs_codec('star', 'bzip2')
def test_star_bz2 (self): def test_star_bz2 (self):
self.program = 'star' self.program = 'star'
self.archive_commands('t.tar.bz2.foo', format="tar", compression="bzip2") self.archive_commands('t.tar.bz2.foo', skip_create=True)
self.archive_commands('t.tbz2.foo', format="tar", compression="bzip2") self.archive_commands('t.tbz2.foo', skip_create=True)
# file(1) does not recognize .lzma files # file(1) does not recognize .lzma files
#@needs_program('file') #@needs_program('file')
#@needs_codec('star', 'lzma') #@needs_codec('star', 'lzma')
#def test_star_lzma (self): #def test_star_lzma (self):
# self.program = 'star' # self.program = 'star'
# self.archive_commands('t.tar.lzma.foo', format="tar", compression="lzma") # self.archive_commands('t.tar.lzma.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('star', 'lzip') @needs_codec('star', 'lzip')
def test_star_lzip (self): def test_star_lzip (self):
self.program = 'star' self.program = 'star'
self.archive_commands('t.tar.lz.foo', format="tar", compression="lzip") self.archive_commands('t.tar.lz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_codec('star', 'xz') @needs_codec('star', 'xz')
def test_star_xz (self): def test_star_xz (self):
self.program = 'star' self.program = 'star'
self.archive_commands('t.tar.xz.foo', format="tar", compression="xz") self.archive_commands('t.tar.xz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
def test_py_tarfile_file (self): def test_py_tarfile_file (self):
self.program = 'py_tarfile' self.program = 'py_tarfile'
self.archive_commands('t.tar.foo', format="tar") self.archive_commands('t.tar.foo', skip_create=True)
@needs_program('file') @needs_program('file')
def test_py_tarfile_gz_file (self): def test_py_tarfile_gz_file (self):
self.program = 'py_tarfile' self.program = 'py_tarfile'
self.archive_commands('t.tar.gz.foo', format="tar", compression="gzip") self.archive_commands('t.tar.gz.foo', skip_create=True)
self.archive_commands('t.tgz.foo', format="tar", compression="gzip") self.archive_commands('t.tgz.foo', skip_create=True)
@needs_program('file') @needs_program('file')
def test_py_tarfile_bz2 (self): def test_py_tarfile_bz2 (self):
self.program = 'py_tarfile' self.program = 'py_tarfile'
self.archive_commands('t.tar.bz2.foo', format="tar", compression="bzip2") self.archive_commands('t.tar.bz2.foo', skip_create=True)
self.archive_commands('t.tbz2.foo', format="tar", compression="bzip2") self.archive_commands('t.tbz2.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_program('bzip2') @needs_program('bzip2')
def test_bzip2 (self): def test_bzip2 (self):
self.program = 'bzip2' self.program = 'bzip2'
self.archive_extract('t.txt.bz2.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2.foo', check=Content.Singlefile)
self.archive_test('t.txt.bz2.foo') self.archive_test('t.txt.bz2.foo')
self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True)
@needs_program('file') @needs_program('file')
def test_py_bz2 (self): def test_py_bz2 (self):
self.program = 'py_bz2' self.program = 'py_bz2'
self.archive_extract('t.txt.bz2.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2.foo', check=Content.Singlefile)
self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('pbzip2') @needs_program('pbzip2')
def test_pbzip2 (self): def test_pbzip2 (self):
self.program = 'pbzip2' self.program = 'pbzip2'
self.archive_extract('t.txt.bz2.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2.foo', check=Content.Singlefile)
self.archive_test('t.txt.bz2.foo') self.archive_test('t.txt.bz2.foo')
self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('lbzip2') @needs_program('lbzip2')
def test_lbzip2 (self): def test_lbzip2 (self):
self.program = 'lbzip2' self.program = 'lbzip2'
self.archive_extract('t.txt.bz2.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2.foo', check=Content.Singlefile)
self.archive_test('t.txt.bz2.foo') self.archive_test('t.txt.bz2.foo')
self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True)
@needs_program('file') @needs_program('file')
def test_py_echo (self): def test_py_echo (self):
@ -227,57 +223,42 @@ class TestArchives (ArchiveTest):
@needs_program('unzip') @needs_program('unzip')
def test_unzip (self): def test_unzip (self):
self.program = 'unzip' self.program = 'unzip'
self.archive_extract('t.zip.foo', contents=None) self.archive_extract('t.zip.foo', check=None)
self.archive_list('t.zip.foo') self.archive_list('t.zip.foo')
self.archive_test('t.zip.foo') self.archive_test('t.zip.foo')
self.archive_extract('t.jar.foo', contents=None) self.archive_extract('t.jar.foo', check=None)
self.archive_list('t.jar.foo') self.archive_list('t.jar.foo')
self.archive_test('t.jar.foo') self.archive_test('t.jar.foo')
@needs_program('file')
@needs_program('zip')
def test_zip (self):
self.program = 'zip'
self.archive_create('t.zip.foo', format="zip")
@needs_program('file') @needs_program('file')
def test_py_zipfile (self): def test_py_zipfile (self):
self.program = 'py_zipfile' self.program = 'py_zipfile'
self.archive_commands('t.zip.foo', format="zip") self.archive_commands('t.zip.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_program('gzip') @needs_program('gzip')
def test_gzip (self): def test_gzip (self):
self.program = 'gzip' self.program = 'gzip'
self.archive_commands('t.txt.gz.foo', format="gzip", singlefile=True) self.archive_commands('t.txt.gz.foo', skip_create=True, check=None)
self.archive_extract('t.txt.Z.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.Z.foo', check=Content.Singlefile)
@needs_program('file') @needs_program('file')
@needs_program('gzip')
def test_py_gzip (self): def test_py_gzip (self):
self.program = 'py_gzip' self.program = 'py_gzip'
self.archive_extract('t.txt.gz.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.gz.foo', check=Content.Singlefile)
# gzip is used to test the created archive
self.archive_create('t.txt.gz.foo', format="gzip", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('uncompress.real') @needs_program('uncompress.real')
def test_uncompress (self): def test_uncompress (self):
self.program = 'uncompress.real' self.program = 'uncompress.real'
self.archive_extract('t.txt.Z.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.Z.foo', check=Content.Singlefile)
@needs_program('file')
@needs_program('compress')
def test_compress (self):
self.program = 'compress'
self.archive_create('t.txt.Z.foo', format="compress", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('7z') @needs_program('7z')
def test_p7zip_file (self): def test_p7zip_file (self):
self.program = '7z' self.program = '7z'
self.archive_commands('t.7z.foo', format="7z") self.archive_commands('t.7z.foo', skip_create=True)
self.archive_commands('t.zip.foo', format="zip") self.archive_commands('t.zip.foo', skip_create=True)
self.archive_list('t.txt.gz.foo') self.archive_list('t.txt.gz.foo')
self.archive_list('t.txt.bz2.foo') self.archive_list('t.txt.bz2.foo')
self.archive_list('t.jar.foo') self.archive_list('t.jar.foo')
@ -287,15 +268,15 @@ class TestArchives (ArchiveTest):
self.archive_list('t.cpio.foo') self.archive_list('t.cpio.foo')
self.archive_list('t.rpm.foo') self.archive_list('t.rpm.foo')
self.archive_list('t.deb.foo') self.archive_list('t.deb.foo')
self.archive_extract('t.txt.gz.foo', contents=None) self.archive_extract('t.txt.gz.foo', check=None)
self.archive_extract('t.txt.bz2.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2.foo', check=Content.Singlefile)
self.archive_extract('t.jar.foo', contents=None) self.archive_extract('t.jar.foo', check=None)
self.archive_extract('t.txt.Z.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.Z.foo', check=Content.Singlefile)
self.archive_extract('t.cab.foo') self.archive_extract('t.cab.foo')
self.archive_extract('t.arj.foo') self.archive_extract('t.arj.foo')
self.archive_extract('t.cpio.foo') self.archive_extract('t.cpio.foo')
self.archive_extract('t.rpm.foo', contents=None) self.archive_extract('t.rpm.foo', check=None)
self.archive_extract('t.deb.foo', contents=None) self.archive_extract('t.deb.foo', check=None)
self.archive_test('t.txt.gz.foo') self.archive_test('t.txt.gz.foo')
self.archive_test('t.txt.bz2.foo') self.archive_test('t.txt.bz2.foo')
self.archive_test('t.jar.foo') self.archive_test('t.jar.foo')
@ -310,8 +291,8 @@ class TestArchives (ArchiveTest):
@needs_program('7za') @needs_program('7za')
def test_p7azip_file (self): def test_p7azip_file (self):
self.program = '7za' self.program = '7za'
self.archive_commands('t.7z.foo', format="7z") self.archive_commands('t.7z.foo', skip_create=True)
self.archive_commands('t.zip.foo', format="zip") self.archive_commands('t.zip.foo', skip_create=True)
self.archive_list('t.txt.gz.foo') self.archive_list('t.txt.gz.foo')
self.archive_list('t.txt.bz2.foo') self.archive_list('t.txt.bz2.foo')
self.archive_list('t.jar.foo') self.archive_list('t.jar.foo')
@ -321,15 +302,15 @@ class TestArchives (ArchiveTest):
#self.archive_list('t.cpio.foo') #self.archive_list('t.cpio.foo')
self.archive_list('t.rpm.foo') self.archive_list('t.rpm.foo')
#self.archive_list('t.deb.foo') #self.archive_list('t.deb.foo')
self.archive_extract('t.txt.gz.foo', contents=None) self.archive_extract('t.txt.gz.foo', check=None)
self.archive_extract('t.txt.bz2.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.bz2.foo', check=Content.Singlefile)
self.archive_extract('t.jar.foo', contents=None) self.archive_extract('t.jar.foo', check=None)
self.archive_extract('t.txt.Z.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.Z.foo', check=Content.Singlefile)
self.archive_extract('t.cab.foo') self.archive_extract('t.cab.foo')
#self.archive_extract('t.arj.foo') #self.archive_extract('t.arj.foo')
#self.archive_extract('t.cpio.foo') #self.archive_extract('t.cpio.foo')
#self.archive_extract('t.rpm.foo', contents=None) #self.archive_extract('t.rpm.foo', check=None)
#self.archive_extract('t.deb.foo', contents=None) #self.archive_extract('t.deb.foo', check=None)
self.archive_test('t.txt.gz.foo') self.archive_test('t.txt.gz.foo')
self.archive_test('t.txt.bz2.foo') self.archive_test('t.txt.bz2.foo')
self.archive_test('t.jar.foo') self.archive_test('t.jar.foo')
@ -360,14 +341,14 @@ class TestArchives (ArchiveTest):
@needs_program('rar') @needs_program('rar')
def test_rar (self): def test_rar (self):
self.program = 'rar' self.program = 'rar'
self.archive_commands('t.rar.foo', format="rar") self.archive_commands('t.rar.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_program('cabextract') @needs_program('cabextract')
def test_cabextract (self): def test_cabextract (self):
self.program = 'cabextract' self.program = 'cabextract'
self.archive_list('t.cab.foo') self.archive_list('t.cab.foo')
self.archive_extract('t.cab.foo', contents=None) self.archive_extract('t.cab.foo', check=None)
@needs_program('file') @needs_program('file')
@needs_program('orange') @needs_program('orange')
@ -375,36 +356,30 @@ class TestArchives (ArchiveTest):
self.program = 'orange' self.program = 'orange'
self.archive_extract('t.cab.foo') self.archive_extract('t.cab.foo')
@needs_program('lcab')
@needs_program('cabextract')
def test_lcab (self):
self.program = 'lcab'
self.archive_create('t.cab.foo', format="cab")
@needs_program('file') @needs_program('file')
@needs_program('arj') @needs_program('arj')
def test_arj (self): def test_arj (self):
self.program = 'arj' self.program = 'arj'
self.archive_commands('t.arj.foo', format="arj") self.archive_commands('t.arj.foo', skip_create=True)
@needs_os('posix') @needs_os('posix')
@needs_program('file') @needs_program('file')
@needs_program('ar') @needs_program('ar')
def test_ar (self): def test_ar (self):
self.program = 'ar' self.program = 'ar'
self.archive_commands('t.txt.a.foo', format='ar', singlefile=True, contents=None) self.archive_commands('t.txt.a.foo', skip_create=True, check=None)
@needs_program('file') @needs_program('file')
@needs_program('cpio') @needs_program('cpio')
def test_cpio (self): def test_cpio (self):
self.program = 'cpio' self.program = 'cpio'
self.archive_commands('t.cpio.foo', format="cpio") self.archive_commands('t.cpio.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_program('bsdcpio') @needs_program('bsdcpio')
def test_bsdcpio (self): def test_bsdcpio (self):
self.program = 'bsdcpio' self.program = 'bsdcpio'
self.archive_commands('t.cpio.foo', format="cpio") self.archive_commands('t.cpio.foo', skip_create=True)
@needs_program('file') @needs_program('file')
@needs_program('unace') @needs_program('unace')
@ -429,21 +404,21 @@ class TestArchives (ArchiveTest):
@needs_program('cpio') @needs_program('cpio')
def test_rpm_extract (self): def test_rpm_extract (self):
self.program = 'rpm2cpio' self.program = 'rpm2cpio'
self.archive_extract('t.rpm.foo', contents=None) self.archive_extract('t.rpm.foo', check=None)
@needs_program('file') @needs_program('file')
@needs_program('dpkg-deb') @needs_program('dpkg-deb')
def test_dpkg (self): def test_dpkg (self):
self.program = 'dpkg' self.program = 'dpkg'
self.archive_list('t.deb.foo') self.archive_list('t.deb.foo')
self.archive_extract('t.deb.foo', contents=None) self.archive_extract('t.deb.foo', check=None)
self.archive_test('t.deb.foo') self.archive_test('t.deb.foo')
@needs_program('file') @needs_program('file')
@needs_program('lzop') @needs_program('lzop')
def test_lzop (self): def test_lzop (self):
self.program = 'lzop' self.program = 'lzop'
self.archive_commands('t.lzo.foo', format="lzop", singlefile=True) self.archive_commands('t.lzo.foo', skip_create=True)
# file(1) does not recognize .lzma files # file(1) does not recognize .lzma files
#@needs_program('file') #@needs_program('file')
@ -452,53 +427,47 @@ class TestArchives (ArchiveTest):
# self.program = 'lzma' # self.program = 'lzma'
# self.archive_test('t.lzma.foo') # self.archive_test('t.lzma.foo')
# self.archive_extract('t.lzma.foo') # self.archive_extract('t.lzma.foo')
# self.archive_create('t.lzma.foo', format="lzma", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('lzip') @needs_program('lzip')
def test_lzip (self): def test_lzip (self):
self.program = 'lzip' self.program = 'lzip'
self.archive_test('t.txt.lz.foo') self.archive_test('t.txt.lz.foo')
self.archive_extract('t.txt.lz.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.lz.foo', check=Content.Singlefile)
self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('clzip') @needs_program('clzip')
def test_clzip (self): def test_clzip (self):
self.program = 'clzip' self.program = 'clzip'
self.archive_test('t.txt.lz.foo') self.archive_test('t.txt.lz.foo')
self.archive_extract('t.txt.lz.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.lz.foo', check=Content.Singlefile)
self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('plzip') @needs_program('plzip')
def test_plzip (self): def test_plzip (self):
self.program = 'plzip' self.program = 'plzip'
self.archive_test('t.txt.lz.foo') self.archive_test('t.txt.lz.foo')
self.archive_extract('t.txt.lz.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.lz.foo', check=Content.Singlefile)
self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('pdlzip') @needs_program('pdlzip')
def test_pdlzip (self): def test_pdlzip (self):
self.program = 'pdlzip' self.program = 'pdlzip'
self.archive_test('t.txt.lz.foo') self.archive_test('t.txt.lz.foo')
self.archive_extract('t.txt.lz.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.lz.foo', check=Content.Singlefile)
self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('xz') @needs_program('xz')
def test_xz (self): def test_xz (self):
self.program = 'xz' self.program = 'xz'
self.archive_test('t.txt.xz.foo') self.archive_test('t.txt.xz.foo')
self.archive_extract('t.txt.xz.foo', contents=ContentSet.Singlefile) self.archive_extract('t.txt.xz.foo', check=Content.Singlefile)
self.archive_create('t.txt.xz.foo', format="xz", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('lha') @needs_program('lha')
def test_lha (self): def test_lha (self):
self.program = 'lha' self.program = 'lha'
self.archive_commands('t.lha.foo', format="lzh") self.archive_commands('t.lha.foo', skip_create=True)
# file(1) does not recognize .alz files # file(1) does not recognize .alz files
#@needs_program('file') #@needs_program('file')
@ -512,7 +481,7 @@ class TestArchives (ArchiveTest):
@needs_program('arc') @needs_program('arc')
def test_arc (self): def test_arc (self):
self.program = 'arc' self.program = 'arc'
self.archive_commands('t.arc.foo', format="arc", singlefile=True) self.archive_commands('t.arc.foo', skip_create=True)
@needs_program('nomarch') @needs_program('nomarch')
def test_nomarch (self): def test_nomarch (self):
@ -534,13 +503,12 @@ class TestArchives (ArchiveTest):
def test_rzip (self): def test_rzip (self):
self.program = 'rzip' self.program = 'rzip'
self.archive_extract('t.txt.rz.foo') self.archive_extract('t.txt.rz.foo')
self.archive_create('t.txt.rz.foo', format="rzip", singlefile=True)
# XXX test failure # XXX test failure
#@needs_program('zoo') #@needs_program('zoo')
#def test_zoo (self): #def test_zoo (self):
# self.program = 'zoo' # self.program = 'zoo'
# self.archive_commands('t.zoo.foo', format="zoo", singlefile=True) # self.archive_commands('t.zoo.foo', skip_create=True)
# xdms(1) cannot handle files without '.dms' extension # xdms(1) cannot handle files without '.dms' extension
#@needs_program('xdms') #@needs_program('xdms')
@ -554,21 +522,18 @@ class TestArchives (ArchiveTest):
@needs_program('mac') @needs_program('mac')
def test_mac (self): def test_mac (self):
self.program = 'mac' self.program = 'mac'
self.archive_extract('t.ape.foo', contents=None) self.archive_extract('t.ape.foo', check=None)
self.archive_create('t.ape.foo', srcfile='t.wav')
# file(1) does not recognize .shn files # file(1) does not recognize .shn files
#@needs_program('file') #@needs_program('file')
#@needs_program('shorten') #@needs_program('shorten')
#def test_shorten (self): #def test_shorten (self):
# self.program = 'shorten' # self.program = 'shorten'
# self.archive_extract('t.shn.foo', contents=None) # self.archive_extract('t.shn.foo', check=None)
# self.archive_create('t.shn.foo', srcfile='t.wav')
@needs_program('file') @needs_program('file')
@needs_program('flac') @needs_program('flac')
def test_flac (self): def test_flac (self):
self.program = 'flac' self.program = 'flac'
self.archive_extract('t.flac.foo', contents=None) self.archive_extract('t.flac.foo', check=None)
self.archive_test('t.flac.foo') self.archive_test('t.flac.foo')
self.archive_create('t.flac.foo', srcfile='t.wav', format='flac')