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

Fix test cases

This commit is contained in:
Bastian Kleineidam 2012-05-25 15:01:18 +02:00
parent 451f18a625
commit 8ed2392f46
8 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/__init__.py
View File

@ -98,8 +98,10 @@ class ArchiveTest (unittest.TestCase):
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 contents == ContentSet.Singlefile:
txtfile = output # a non-existing directory to ensure files do not exist in it
self.check_textfile(txtfile, 't.txt') ned = get_nonexisting_directory()
expected_output = os.path.basename(patoolib.util.get_single_outfile(ned, archive))
self.check_textfile(output, expected_output)
def check_directory (self, dirname, expectedname): def check_directory (self, dirname, expectedname):
self.assertTrue(os.path.isdir(dirname), dirname) self.assertTrue(os.path.isdir(dirname), dirname)
@ -245,3 +247,10 @@ def has_codec (program, codec):
if patoolib.program_supports_compression(program, codec): if patoolib.program_supports_compression(program, codec):
return True return True
return patoolib.util.find_program(codec) return patoolib.util.find_program(codec)
def get_nonexisting_directory():
d = os.path.join(os.getcwd(), "foo")
while os.path.exists(d):
d += 'a'
return d

BIN
tests/data/t.7z.foo
View File

Binary file not shown.

0
tests/data/t.a → tests/data/t.txt.a
View File

0
tests/data/t.a.foo → tests/data/t.txt.a.foo
View File

BIN
tests/data/t.txt.lz.foo
View File

Binary file not shown.

6
tests/test_archives.py
View File

@ -198,7 +198,7 @@ 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') self.archive_extract('t.zip', contents=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', contents=None)
@ -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') self.archive_extract('t.cab', contents=None)
@needs_program('orange') @needs_program('orange')
def test_orange (self): def test_orange (self):
@ -354,7 +354,7 @@ class TestArchives (ArchiveTest):
@needs_program('ar') @needs_program('ar')
def test_ar (self): def test_ar (self):
self.program = 'ar' self.program = 'ar'
self.archive_commands('t.a', singlefile=True) self.archive_commands('t.txt.a', singlefile=True)
@needs_program('cpio') @needs_program('cpio')
def test_cpio (self): def test_cpio (self):

54
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 from tests import ArchiveTest, needs_os, needs_program, needs_codec, ContentSet
class TestArchives (ArchiveTest): class TestArchives (ArchiveTest):
@ -182,21 +182,21 @@ 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.foo') self.archive_extract('t.txt.bz2.foo', contents=ContentSet.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) 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') self.archive_extract('t.txt.bz2.foo', contents=ContentSet.Singlefile)
self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True) 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') self.archive_extract('t.txt.bz2.foo', contents=ContentSet.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) self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True)
@ -204,7 +204,7 @@ class TestArchives (ArchiveTest):
@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') self.archive_extract('t.txt.bz2.foo', contents=ContentSet.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) self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True)
@ -227,7 +227,7 @@ 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') self.archive_extract('t.zip.foo', contents=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', contents=None)
@ -250,13 +250,13 @@ class TestArchives (ArchiveTest):
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', format="gzip", singlefile=True)
self.archive_extract('t.txt.Z.foo') self.archive_extract('t.txt.Z.foo', contents=ContentSet.Singlefile)
@needs_program('file') @needs_program('file')
@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.foo') self.archive_extract('t.txt.gz.foo', contents=ContentSet.Singlefile)
# gzip is used to test the created archive # gzip is used to test the created archive
self.archive_create('t.txt.gz.foo', format="gzip", singlefile=True) self.archive_create('t.txt.gz.foo', format="gzip", singlefile=True)
@ -264,7 +264,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.foo') self.archive_extract('t.txt.Z.foo', contents=ContentSet.Singlefile)
@needs_program('file') @needs_program('file')
@needs_program('compress') @needs_program('compress')
@ -287,10 +287,10 @@ 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') self.archive_extract('t.txt.gz.foo', contents=None)
self.archive_extract('t.txt.bz2.foo') self.archive_extract('t.txt.bz2.foo', contents=ContentSet.Singlefile)
self.archive_extract('t.jar.foo', contents=None) self.archive_extract('t.jar.foo', contents=None)
self.archive_extract('t.txt.Z.foo') self.archive_extract('t.txt.Z.foo', contents=ContentSet.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')
@ -321,10 +321,10 @@ 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') self.archive_extract('t.txt.gz.foo', contents=None)
self.archive_extract('t.txt.bz2.foo') self.archive_extract('t.txt.bz2.foo', contents=ContentSet.Singlefile)
self.archive_extract('t.jar.foo', contents=None) self.archive_extract('t.jar.foo', contents=None)
self.archive_extract('t.txt.Z.foo') self.archive_extract('t.txt.Z.foo', contents=ContentSet.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')
@ -367,7 +367,7 @@ class TestArchives (ArchiveTest):
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') self.archive_extract('t.cab.foo', contents=None)
@needs_program('file') @needs_program('file')
@needs_program('orange') @needs_program('orange')
@ -392,7 +392,7 @@ class TestArchives (ArchiveTest):
@needs_program('ar') @needs_program('ar')
def test_ar (self): def test_ar (self):
self.program = 'ar' self.program = 'ar'
self.archive_commands('t.a.foo', format='ar', singlefile=True) self.archive_commands('t.txt.a.foo', format='ar', singlefile=True, contents=None)
@needs_program('file') @needs_program('file')
@needs_program('cpio') @needs_program('cpio')
@ -459,7 +459,7 @@ class TestArchives (ArchiveTest):
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') self.archive_extract('t.txt.lz.foo', contents=ContentSet.Singlefile)
self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True) self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True)
@needs_program('file') @needs_program('file')
@ -467,7 +467,7 @@ class TestArchives (ArchiveTest):
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') self.archive_extract('t.txt.lz.foo', contents=ContentSet.Singlefile)
self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True) self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True)
@needs_program('file') @needs_program('file')
@ -475,7 +475,7 @@ class TestArchives (ArchiveTest):
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') self.archive_extract('t.txt.lz.foo', contents=ContentSet.Singlefile)
self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True) self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True)
@needs_program('file') @needs_program('file')
@ -483,16 +483,16 @@ class TestArchives (ArchiveTest):
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') self.archive_extract('t.txt.lz.foo', contents=ContentSet.Singlefile)
self.archive_create('t.txt.lz.foo', format="lzip", singlefile=True) 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.xz.foo') self.archive_test('t.txt.xz.foo')
self.archive_extract('t.xz.foo') self.archive_extract('t.txt.xz.foo', contents=ContentSet.Singlefile)
self.archive_create('t.xz.foo', format="xz", singlefile=True) self.archive_create('t.txt.xz.foo', format="xz", singlefile=True)
@needs_program('file') @needs_program('file')
@needs_program('lha') @needs_program('lha')
@ -554,7 +554,7 @@ 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') self.archive_extract('t.ape.foo', contents=None)
self.archive_create('t.ape.foo', srcfile='t.wav') self.archive_create('t.ape.foo', srcfile='t.wav')
# file(1) does not recognize .shn files # file(1) does not recognize .shn files
@ -562,13 +562,13 @@ class TestArchives (ArchiveTest):
#@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') # self.archive_extract('t.shn.foo', contents=None)
# self.archive_create('t.shn.foo', srcfile='t.wav') # 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') self.archive_extract('t.flac.foo', contents=None)
self.archive_test('t.flac.foo') self.archive_test('t.flac.foo')
self.archive_create('t.flac.foo', srcfile='t.wav', format='flac') self.archive_create('t.flac.foo', srcfile='t.wav', format='flac')

4
tests/test_mime.py
View File

@ -97,8 +97,8 @@ class TestMime (unittest.TestCase):
self.mime_test_file("t.zip.foo", "application/zip", None) self.mime_test_file("t.zip.foo", "application/zip", None)
self.mime_test_file("t.ace", "application/x-ace", None) self.mime_test_file("t.ace", "application/x-ace", None)
self.mime_test_file("t.ace.foo", "application/x-ace", None) self.mime_test_file("t.ace.foo", "application/x-ace", None)
self.mime_test_file("t.a", "application/x-archive", None) self.mime_test_file("t.txt.a", "application/x-archive", None)
self.mime_test_file("t.a.foo", "application/x-archive", None) self.mime_test_file("t.txt.a.foo", "application/x-archive", None)
self.mime_test_file("t.lha", "application/x-lha", None) self.mime_test_file("t.lha", "application/x-lha", None)
self.mime_test_file("t.lzh", "application/x-lha", None) self.mime_test_file("t.lzh", "application/x-lha", None)
self.mime_test_file("t.lha.foo", "application/x-lha", None) self.mime_test_file("t.lha.foo", "application/x-lha", None)