]> granicus.if.org Git - zziplib/commitdiff
Fixed tests on macOS
authorKirill A. Korinsky <kirill@korins.ky>
Mon, 20 Sep 2021 16:27:40 +0000 (18:27 +0200)
committerKirill A. Korinsky <kirill@korins.ky>
Mon, 20 Sep 2021 16:27:40 +0000 (18:27 +0200)
It fixes https://github.com/gdraheim/zziplib/issues/120 by adding `123`
exit code which is macOS's way to return `-8`.

It also fixed minor differences in output.

test/zziptests.py

index f315dc70969cbdf307bd1844bf6029d0849c36b3..10dc6d970d7aa906c5cfa850efd68dde0c5d7158 100644 (file)
@@ -3662,7 +3662,7 @@ class ZZipTest(unittest.TestCase):
     self.assertFalse(run.returncode)
     # list the ZIPfile
     exe=self.bins("unzip-mem");
-    run = shell("{chdir} {tmpdir} && ../{exe} -v {zipname}.zip".format(**locals()), returncodes = [0,-8])
+    run = shell("{chdir} {tmpdir} && ../{exe} -v {zipname}.zip".format(**locals()), returncodes = [0,-8,136])
     logg.error("FIXME: unzip-mem test_65485 is not solved")
     self.skipTest("FIXME: not solved")
     self.assertFalse(run.returncode)
@@ -3841,12 +3841,12 @@ class ZZipTest(unittest.TestCase):
     exe = self.bins("unzzip-mix")
     run = shell("{exe} -l {tmpdir}/{filename} ".format(**locals()),
         returncodes = [2])
-    self.assertTrue(greps(run.errors, "Invalid or incomplete"))
+    self.assertTrue(greps(run.errors, "Invalid or incomplete") or greps(run.errors, "Illegal byte sequence"))
     #
     run = shell("cd {tmpdir} && ../{exe} {filename} ".format(**locals()),
         returncodes = [2])
     # self.assertLess(len(run.output), 30)
-    self.assertTrue(greps(run.errors, "Invalid or incomplete"))
+    self.assertTrue(greps(run.errors, "Invalid or incomplete") or greps(run.errors, "Illegal byte sequence"))
     self.rm_testdir()
   def test_65674(self):
     """ unzzip-zap -l $(CVE).zip  """