From 748a1dcea6676e9234ca86dcc8e847980191890a Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Mon, 17 Jan 2011 13:42:08 -0600 Subject: [PATCH] Added test for ZIP file creation with 7z and 7za. --- tests/test_archives.py | 8 ++------ tests/test_foo_archives.py | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/test_archives.py b/tests/test_archives.py index 9384662..8c05454 100644 --- a/tests/test_archives.py +++ b/tests/test_archives.py @@ -156,9 +156,9 @@ class TestArchives (ArchiveTest): def test_p7zip (self): self.program = '7z' self.archive_commands('t .7z') + self.archive_commands('t.zip') self.archive_list('t.gz') self.archive_list('t .bz2') - self.archive_list('t.zip') self.archive_list('t.jar') self.archive_list('t.Z') self.archive_list('t.cab') @@ -168,7 +168,6 @@ class TestArchives (ArchiveTest): self.archive_list('t.deb') self.archive_extract('t.gz') self.archive_extract('t .bz2') - self.archive_extract('t.zip') self.archive_extract('t.jar') self.archive_extract('t.Z') self.archive_extract('t.cab') @@ -178,7 +177,6 @@ class TestArchives (ArchiveTest): self.archive_extract('t.deb') self.archive_test('t.gz') self.archive_test('t .bz2') - self.archive_test('t.zip') self.archive_test('t.jar') self.archive_test('t.Z') self.archive_test('t.cab') @@ -200,9 +198,9 @@ class TestArchives (ArchiveTest): # unsupported actions of the 7za standalone program are commented out self.program = '7za' self.archive_commands('t .7z') + self.archive_commands('t.zip') self.archive_list('t.gz') self.archive_list('t .bz2') - self.archive_list('t.zip') self.archive_list('t.jar') self.archive_list('t.Z') self.archive_list('t.cab') @@ -212,7 +210,6 @@ class TestArchives (ArchiveTest): #self.archive_list('t.deb') self.archive_extract('t.gz') self.archive_extract('t .bz2') - self.archive_extract('t.zip') self.archive_extract('t.jar') self.archive_extract('t.Z') self.archive_extract('t.cab') @@ -222,7 +219,6 @@ class TestArchives (ArchiveTest): #self.archive_extract('t.deb') self.archive_test('t.gz') self.archive_test('t .bz2') - self.archive_test('t.zip') self.archive_test('t.jar') self.archive_test('t.Z') self.archive_test('t.cab') diff --git a/tests/test_foo_archives.py b/tests/test_foo_archives.py index acd22b4..093e5e5 100644 --- a/tests/test_foo_archives.py +++ b/tests/test_foo_archives.py @@ -180,9 +180,9 @@ class TestArchives (ArchiveTest): def test_p7zip_file (self): self.program = '7z' self.archive_commands('t.7z.foo', format="7z") + self.archive_commands('t.zip.foo', format="zip") self.archive_list('t.gz.foo') self.archive_list('t.bz2.foo') - self.archive_list('t.zip.foo') self.archive_list('t.jar.foo') self.archive_list('t.Z.foo') self.archive_list('t.cab.foo') @@ -192,7 +192,6 @@ class TestArchives (ArchiveTest): self.archive_list('t.deb.foo') self.archive_extract('t.gz.foo') self.archive_extract('t.bz2.foo') - self.archive_extract('t.zip.foo') self.archive_extract('t.jar.foo') self.archive_extract('t.Z.foo') self.archive_extract('t.cab.foo') @@ -202,7 +201,6 @@ class TestArchives (ArchiveTest): self.archive_extract('t.deb.foo') self.archive_test('t.gz.foo') self.archive_test('t.bz2.foo') - self.archive_test('t.zip.foo') self.archive_test('t.jar.foo') self.archive_test('t.Z.foo') self.archive_test('t.cab.foo') @@ -216,9 +214,9 @@ class TestArchives (ArchiveTest): def test_p7azip_file (self): self.program = '7za' self.archive_commands('t.7z.foo', format="7z") + self.archive_commands('t.zip.foo', format="zip") self.archive_list('t.gz.foo') self.archive_list('t.bz2.foo') - self.archive_list('t.zip.foo') self.archive_list('t.jar.foo') self.archive_list('t.Z.foo') self.archive_list('t.cab.foo') @@ -228,7 +226,6 @@ class TestArchives (ArchiveTest): #self.archive_list('t.deb.foo') self.archive_extract('t.gz.foo') self.archive_extract('t.bz2.foo') - self.archive_extract('t.zip.foo') self.archive_extract('t.jar.foo') self.archive_extract('t.Z.foo') self.archive_extract('t.cab.foo') @@ -238,7 +235,6 @@ class TestArchives (ArchiveTest): #self.archive_extract('t.deb.foo') self.archive_test('t.gz.foo') self.archive_test('t.bz2.foo') - self.archive_test('t.zip.foo') self.archive_test('t.jar.foo') self.archive_test('t.Z.foo') self.archive_test('t.cab.foo')