fix zzdir-mem tests

diff --git a/bins/unzzipdir-mix.c b/bins/unzzipdir-mix.c
index 6946c4eb2749f364a3f7d94ee7892089ce3e31f7..5fdc98e382731021a068452d7f4e88c243f3a019 100644 (file)
--- a/bins/unzzipdir-mix.c
+++ b/bins/unzzipdir-mix.c
@@ -49,7 +49,7 @@ unzzip_list (int argc, char ** argv)
 
     if (argc == 2)
     {  /* list all */
-       ZZIP_DIRENT* entry = zzip_readdir(disk);
+       ZZIP_DIRENT* entry = 0;
        while((entry = zzip_readdir(disk)))
        {
            char* name = entry->d_name;

diff --git a/test/zziptests.py b/test/zziptests.py
index bcc51481a50f1434dc9b392410036fd850681125..59c17b570088b15285f85504f2edb414b784a792 100644 (file)
--- a/test/zziptests.py
+++ b/test/zziptests.py
@@ -825,7 +825,7 @@ class ZZipTest(unittest.TestCase):
     self.assertIn(' stored ', run.output)
   def test_520_zzdir_mix_test0_zip(self):
     """ run zzdir-mix on test0.zip  """
-    self.skipTest("todo")
+    # self.skipTest("todo")
     zipfile = "test0.zip"
     getfile = "test0.zip"
     exe = self.bins("unzzip-mix")
@@ -833,6 +833,51 @@ class ZZipTest(unittest.TestCase):
     self.assertIn(' README ', run.output)
     self.assertIn(' deflated ', run.output)
     self.assertLess(len(run.output), 30)
+  def test_521_zzdir_mix_test1_zip(self):
+    """ run zzdir-mix on test1.zip  """
+    zipfile = "test1.zip"
+    getfile = "test1.zip"
+    exe = self.bins("unzzip-mix")
+    run = shell("{exe} -l {getfile} ".format(**locals()))
+    self.assertIn(' file.1 ', run.output)
+    self.assertIn(' file.2 ', run.output)
+    self.assertIn(' file.9 ', run.output)
+    self.assertIn(' README ', run.output)
+    self.assertIn(' deflated ', run.output)
+    self.assertIn(' stored ', run.output)
+  def test_522_zzdir_mix_test2_zip(self):
+    """ run zzdir-mix on test2.zip """
+    zipfile = "test2.zip"
+    getfile = "test2.zip"
+    exe = self.bins("unzzip-mix")
+    run = shell("{exe} -l {getfile} ".format(**locals()))
+    self.assertIn(' file.01 ', run.output)
+    self.assertIn(' file.22 ', run.output)
+    self.assertIn(' file.99 ', run.output)
+    self.assertIn(' deflated ', run.output)
+    self.assertIn(' stored ', run.output)
+  def test_523_zzdir_mix_test3_zip(self):
+    """ run zzdir-mix on test3.zip  """
+    zipfile = "test3.zip"
+    getfile = "test3.zip"
+    exe = self.bins("unzzip-mix")
+    run = shell("{exe} -l {getfile} ".format(**locals()))
+    self.assertIn(' file.001 ', run.output)
+    self.assertIn(' file.222 ', run.output)
+    self.assertIn(' file.999 ', run.output)
+    self.assertIn(' deflated ', run.output)
+    self.assertIn(' stored ', run.output)
+  def test_524_zzdir_mix_test4_zip(self):
+    """ run zzdir-mix on test4.zip """
+    zipfile = "test4.zip"
+    getfile = "test4.zip"
+    exe = self.bins("unzzip-mix")
+    run = shell("{exe} -l {getfile} ".format(**locals()))
+    self.assertIn(' file.001 ', run.output)
+    self.assertIn(' file.222 ', run.output)
+    self.assertIn(' file.999 ', run.output)
+    self.assertNotIn(' deflated ', run.output)
+    self.assertIn(' stored ', run.output)
   def test_540_zzdir_zap_test0_zip(self):
     """ run zzdir-zap on test0.zip  """
     zipfile = "test0.zip"