diffoscope 272__tar.gz → 274__tar.gz

{diffoscope-272 → diffoscope-274}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 272
+Version: 274
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers
@@ -21,10 +21,25 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Utilities
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
+License-File: COPYING
+Requires-Dist: python-magic
+Requires-Dist: libarchive-c
+Provides-Extra: distro-detection
+Requires-Dist: distro; extra == "distro-detection"
 Provides-Extra: cmdline
+Requires-Dist: argcomplete; extra == "cmdline"
+Requires-Dist: progressbar; extra == "cmdline"
 Provides-Extra: comparators
-Provides-Extra: distro_detection
-License-File: COPYING
+Requires-Dist: androguard; extra == "comparators"
+Requires-Dist: binwalk; extra == "comparators"
+Requires-Dist: defusedxml; extra == "comparators"
+Requires-Dist: guestfs; extra == "comparators"
+Requires-Dist: jsondiff; extra == "comparators"
+Requires-Dist: python-debian; extra == "comparators"
+Requires-Dist: pypdf; extra == "comparators"
+Requires-Dist: pyxattr; extra == "comparators"
+Requires-Dist: rpm-python; extra == "comparators"
+Requires-Dist: tlsh; extra == "comparators"
 
 diffoscope
 ==========

{diffoscope-272 → diffoscope-274}/debian/changelog

@@ -1,8 +1,48 @@
-diffoscope (273) UNRELEASED; urgency=medium
+diffoscope (275) UNRELEASED; urgency=medium
 
   * WIP (generated upon release).
 
- -- Chris Lamb <lamby@debian.org>  Fri, 05 Jul 2024 07:17:15 -0700
+ -- Chris Lamb <lamby@debian.org>  Fri, 09 Aug 2024 12:56:33 +0100
+
+diffoscope (274) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * Add support for IO::Compress::Zip >= 2.212. (Closes: #1078050)
+  * Don't include debug output when calling dumppdf(1).
+  * Append output from dumppdf(1) in more cases.
+    (Closes: reproducible-builds/diffoscope#387)
+  * Update copyright years.
+
+  [ Mattia Rizzolo ]
+  * Update the available architectures for test dependencies.
+
+ -- Chris Lamb <lamby@debian.org>  Fri, 09 Aug 2024 12:52:36 +0100
+
+diffoscope (273) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * Factor out version detection in test_jpeg_image. (Re:
+    reproducible-builds/diffoscope#384)
+  * Ensure that 'convert' is from Imagemagick 6.x; we will need to update a
+    few things with IM7. (Closes: reproducible-builds/diffoscope#384)
+  * Correct import of identify_version after refactoring change in 037bdcbb0.
+
+  [ Mattia Rizzolo ]
+  * tests:
+    + Add OpenSSH key test with a ed25519 key.
+    + Skip the OpenSSH test with DSA key if openssh is >> 9.7
+    + Support ffmpeg >= 7 that adds some extra context to the diff
+  * Do not ignore testing in gitlab-ci.
+  * debian:
+    + Temporarily remove aapt, androguard and dexdump from the build/test
+      dependencies as they are not available in testin/trixie.  Closes: #1070416
+    + Bump Standards-Version to 4.7.0, no changes needed.
+    + Adjust options to make sure not to pack the python s-dist directory
+      into the debian source package.
+    + Adjust the lintian overrides.
+
+
+ -- Mattia Rizzolo <mattia@debian.org>  Wed, 31 Jul 2024 15:31:22 +0900
 
 diffoscope (272) unstable; urgency=medium
 

{diffoscope-272 → diffoscope-274}/debian/control

@@ -8,9 +8,9 @@ Uploaders:
  Mattia Rizzolo <mattia@debian.org>,
 Build-Depends:
  7zip <!nocheck>,
- aapt <!nocheck>,
+# aapt <!nocheck>,
  abootimg <!nocheck>,
- androguard <!nocheck>,
+# androguard <!nocheck>,
  apksigcopier <!nocheck>,
  apksigner <!nocheck>,
  bash-completion,
@@ -23,7 +23,7 @@ Build-Depends:
  debhelper-compat (= 13),
  default-jdk-headless <!nocheck> | default-jdk <!nocheck>,
  device-tree-compiler (>= 1.4.2) <!nocheck>,
- dexdump <!nocheck>,
+# dexdump <!nocheck>,
  dh-python (>= 2.20160818~),
  docx2txt <!nocheck>,
  dpkg-dev (>= 1.17.14),
@@ -98,7 +98,7 @@ Build-Depends:
  zstd <!nocheck>,
 Build-Conflicts:
  graphicsmagick-imagemagick-compat,
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Rules-Requires-Root: no
 Homepage: https://diffoscope.org
 Vcs-Git: https://salsa.debian.org/reproducible-builds/diffoscope.git

diffoscope-274/debian/diffoscope-minimal.lintian-overrides

@@ -0,0 +1 @@
+executable-in-usr-lib [usr/lib/python3/dist-packages/diffoscope/scripts/extract-vmlinux]

{diffoscope-272 → diffoscope-274}/debian/source/lintian-overrides

@@ -19,6 +19,8 @@ source-is-missing [tests/data/test1.o]
 source-is-missing [tests/data/test2.o]
 source-is-missing [tests/data/test1.debug]
 source-is-missing [tests/data/test2.debug]
+source-contains-prebuilt-binary [tests/data/test1.o]
+source-contains-prebuilt-binary [tests/data/test2.o]
 source-contains-prebuilt-binary [tests/data/test1.debug]
 source-contains-prebuilt-binary [tests/data/test2.debug]
 source-contains-prebuilt-windows-binary [tests/data/test1.exe]
@@ -31,6 +33,9 @@ source-contains-prebuilt-wasm-binary [tests/data/hello2.wasm]
 #source-is-missing [tests/data/test1.pyc-renamed]
 #source-is-missing [tests/data/test2.pyc-renamed]
 
+# another test artefact
+source-is-missing [tests/data/output_expected_363.html]
+
 # override warning we can fix nicely with python-debian from bookworm or later.
 # (= so once we don't maintain diffoscope in bullseye-backports anymore)
 # we can fix this in debian/tests/control.sh by running

{diffoscope-272 → diffoscope-274}/debian/source/options

@@ -9,3 +9,5 @@
 --tar-ignore=.gitattributes
 --tar-ignore=.gitignore
 --tar-ignore=.gitmodules
+--tar-ignore=.git-blame-ignore-revs
+--tar-ignore=dist

diffoscope-274/debian/tests/control

@@ -0,0 +1,18 @@
+# DON'T MANUALLY MODIFY!
+# EDIT debian/tests/control.in INSTEAD!
+#
+# To regenerate:
+#
+#   $ debian/rules clean
+#   $ mv debian/tests/control.tmp debian/tests/control
+
+Tests: pytest-with-recommends
+Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, abootimg, acl, apksigcopier, apksigner, apktool, binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils [!risv64], db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!riscv64 !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils, gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools, libxmlb-utils, llvm, lz4, lzip, mono-utils [!riscv64], ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
+
+Tests: pytest
+Depends: python3-all, diffoscope, python3-pytest, python3-h5py, file, python3-tlsh
+
+Tests: basic-command-line
+Depends: diffoscope
+Restrictions: allow-stderr
+# without Recommends

{diffoscope-272 → diffoscope-274}/debian/tests/control.sh

@@ -19,9 +19,15 @@ sed -i "s#radare2, ##" debian/tests/control.tmp
 
 sed -i "s,python3-python-debian,python3-debian," debian/tests/control.tmp
 sed -i "s,python3-rpm-python,python3-rpm," debian/tests/control.tmp
-sed -i "s,apktool,apktool [!ppc64el !s390x]," debian/tests/control.tmp
-sed -i "s,fp-utils,fp-utils [!ppc64el !s390x]," debian/tests/control.tmp
+sed -i "s,coreboot-utils,coreboot-utils [!risv64]," debian/tests/control.tmp
+sed -i "s,fp-utils,fp-utils [!riscv64 !s390x]," debian/tests/control.tmp
+sed -i "s,mono-utils,mono-utils [!riscv64]," debian/tests/control.tmp
 sed -i "s,oggvideotools,oggvideotools [!s390x]," debian/tests/control.tmp
-sed -i "s,python3-androguard,androguard," debian/tests/control.tmp
-sed -i "s,dexdump,dexdump [amd64 arm64 armhf i386]," debian/tests/control.tmp
-sed -i "s,aapt,aapt [amd64 arm64 armel armhf i386 mips64el mipsel]," debian/tests/control.tmp
+#sed -i "s,python3-androguard,androguard," debian/tests/control.tmp
+#sed -i "s,dexdump,dexdump [amd64 arm64 armhf i386]," debian/tests/control.tmp
+# aapt removed due to not being in trixie atma - #1070416
+# also remove androguard and dexdump for the same reason
+#sed -i "s,aapt,aapt [amd64 arm64 armel armhf i386 mips64el mipsel]," debian/tests/control.tmp
+sed -i "s#aapt, ##" debian/tests/control.tmp
+sed -i "s#dexdump, ##" debian/tests/control.tmp
+sed -i "s#python3-androguard, ##" debian/tests/control.tmp

{diffoscope-272 → diffoscope-274}/debian/tests/pytest

@@ -9,7 +9,7 @@ fi
 
 export LIBGUESTFS_MEMSIZE=128
 if [ "$(basename "$0")" = "pytest-with-recommends" ]; then
-    export DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS="aapt2 apktool dexdump zipinfo pedump oggDump ppudump otool lipo radare2"
+    export DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS="aapt2 androguard apktool dexdump zipinfo pedump oggDump ppudump otool lipo radare2"
 fi
 
 for py in $(py3versions -s); do

{diffoscope-272 → diffoscope-274}/debian/tests/pytest-with-recommends

@@ -9,7 +9,7 @@ fi
 
 export LIBGUESTFS_MEMSIZE=128
 if [ "$(basename "$0")" = "pytest-with-recommends" ]; then
-    export DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS="aapt2 apktool dexdump zipinfo pedump oggDump ppudump otool lipo radare2"
+    export DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS="aapt2 androguard apktool dexdump zipinfo pedump oggDump ppudump otool lipo radare2"
 fi
 
 for py in $(py3versions -s); do

{diffoscope-272 → diffoscope-274}/diffoscope/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "272"
+VERSION = "274"

{diffoscope-272 → diffoscope-274}/diffoscope/comparators/pdf.py

@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2016, 2018-2023 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2016, 2018-2024 Chris Lamb <lamby@debian.org>
 # Copyright © 2023 Mattia Rizzolo <mattia@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
@@ -86,7 +86,7 @@ class Pdftotext(Command):
 class Dumppdf(Command):
     @tool_required("dumppdf")
     def cmdline(self):
-        return ["dumppdf", "-adt", self.path]
+        return ["dumppdf", "-at", self.path]
 
 
 class PdfFile(File):
@@ -96,16 +96,18 @@ class PdfFile(File):
     def compare_details(self, other, source=None):
         xs = []
 
-        xs.extend(self.gen_metadata_differences(other))
         xs.append(Difference.from_operation(Pdftotext, self.path, other.path))
 
-        # Don't include verbose dumppdf output unless we won't see any
-        # differences without it.
+        # Include verbose dumppdf output unless we won't see any differences
+        # without it.
         if not any(xs):
             xs.append(
                 Difference.from_operation(Dumppdf, self.path, other.path)
             )
 
+        # Always preppend metadata differences
+        xs[:0] = self.gen_metadata_differences(other)
+
         return xs
 
     def gen_metadata_differences(self, other):

{diffoscope-272 → diffoscope-274}/diffoscope.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 272
+Version: 274
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers
@@ -21,10 +21,25 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Utilities
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
+License-File: COPYING
+Requires-Dist: python-magic
+Requires-Dist: libarchive-c
+Provides-Extra: distro-detection
+Requires-Dist: distro; extra == "distro-detection"
 Provides-Extra: cmdline
+Requires-Dist: argcomplete; extra == "cmdline"
+Requires-Dist: progressbar; extra == "cmdline"
 Provides-Extra: comparators
-Provides-Extra: distro_detection
-License-File: COPYING
+Requires-Dist: androguard; extra == "comparators"
+Requires-Dist: binwalk; extra == "comparators"
+Requires-Dist: defusedxml; extra == "comparators"
+Requires-Dist: guestfs; extra == "comparators"
+Requires-Dist: jsondiff; extra == "comparators"
+Requires-Dist: python-debian; extra == "comparators"
+Requires-Dist: pypdf; extra == "comparators"
+Requires-Dist: pyxattr; extra == "comparators"
+Requires-Dist: rpm-python; extra == "comparators"
+Requires-Dist: tlsh; extra == "comparators"
 
 diffoscope
 ==========

{diffoscope-272 → diffoscope-274}/diffoscope.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ debian/control
 debian/copyright
 debian/diffoscope-minimal.docs
 debian/diffoscope-minimal.install
+debian/diffoscope-minimal.lintian-overrides
 debian/diffoscope-minimal.manpages
 debian/diffoscope.docs
 debian/gbp.conf
@@ -412,7 +413,8 @@ tests/data/no-perms.tar
 tests/data/ocaml_expected_diff
 tests/data/odt_expected_diff
 tests/data/ogg_expected_diff
-tests/data/openssh_pub_key_expected_diff
+tests/data/openssh_pub_key_expected_diff_12
+tests/data/openssh_pub_key_expected_diff_23
 tests/data/order1a.json
 tests/data/order1b.json
 tests/data/output.colored.txt
@@ -628,6 +630,7 @@ tests/data/test_iso8859-1.mo
 tests/data/test_no_charset.mo
 tests/data/test_openssh_pub_key1.pub
 tests/data/test_openssh_pub_key2.pub
+tests/data/test_openssh_pub_key3.pub
 tests/data/test_weird_non_unicode_chars1.pdf
 tests/data/test_weird_non_unicode_chars2.pdf
 tests/data/test_xml_expected_diff

{diffoscope-272 → diffoscope-274}/tests/comparators/test_ffprobe.py

@@ -21,7 +21,7 @@ import subprocess
 
 from diffoscope.comparators.ffprobe import FfprobeFile
 
-from ..utils.data import load_fixture, assert_diff
+from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 from ..utils.nonexisting import assert_non_existing
 
@@ -54,7 +54,11 @@ def differences(mp3_1, mp3_2):
 @skip_unless_tools_exist("ffprobe")
 @skip_unless_tool_is_at_least("ffprobe", ffprobe_version, "4.4")
 def test_diff(differences):
-    assert_diff(differences[0], "mp3_expected_diff")
+    # >= 7 adds a "(mp3float)" annotation
+    computed_diff = differences[0].unified_diff.replace(
+        "mp3 (mp3float)", "mp3"
+    )
+    assert computed_diff == get_data("mp3_expected_diff")
 
 
 @skip_unless_tools_exist("ffprobe")

{diffoscope-272 → diffoscope-274}/tests/comparators/test_ico_image.py

@@ -1,7 +1,7 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2017, 2019-2020, 2023 Chris Lamb <lamby@debian.org>
+# Copyright © 2017, 2019-2020, 2023-2024 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ from ..utils.tools import (
     skip_unless_tools_exist,
     skip_unless_tool_is_between,
 )
-from .test_jpeg_image import identify_version
+from .test_jpeg_image import imagemagick_version
 
 
 image1 = load_fixture("test1.ico")
@@ -61,7 +61,7 @@ def differences_meta(image1_meta, image2_meta):
 
 @skip_unless_tools_exist("img2txt", "identify")
 @skip_unless_tool_is_between(
-    "identify", identify_version, "6.9.10-23", "7.0.0"
+    "identify", lambda: imagemagick_version("identify"), "6.9.10-23", "7.0.0"
 )
 def test_diff_meta(differences_meta):
     assert_diff(differences_meta[-1], "ico_image_meta_expected_diff")
@@ -69,7 +69,7 @@ def test_diff_meta(differences_meta):
 
 @skip_unless_tools_exist("img2txt", "identify")
 @skip_unless_tool_is_between(
-    "identify", identify_version, "6.9.10-23", "7.0.0"
+    "identify", lambda: imagemagick_version("identify"), "6.9.10-23", "7.0.0"
 )
 def test_diff_meta2(differences_meta):
     assert_diff(differences_meta[-1], "ico_image_meta_expected_diff_v2")

{diffoscope-272 → diffoscope-274}/tests/comparators/test_jpeg_image.py

@@ -1,7 +1,7 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2017, 2020, 2023 Chris Lamb <lamby@debian.org>
+# Copyright © 2017, 2020, 2023-2024 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,8 +33,8 @@ image1_meta = load_fixture("test1_meta.jpg")
 image2_meta = load_fixture("test2_meta.jpg")
 
 
-def identify_version():
-    out = subprocess.check_output(["identify", "-version"]).decode("utf-8")
+def imagemagick_version(command):
+    out = subprocess.check_output([command, "-version"]).decode("utf-8")
     # First line is expected to look like
     # "Version: ImageMagick 6.9.6-6 Q16 x86_64 20161125 ..."
     if not out.startswith("Version: ImageMagick "):
@@ -75,11 +75,16 @@ def differences_meta(image1_meta, image2_meta):
 
 
 @skip_unless_tools_exist("img2txt", "identify")
-@skip_unless_tool_is_between("identify", identify_version, "6.9.6", "7.0.0")
+@skip_unless_tool_is_between(
+    "identify", lambda: imagemagick_version("identify"), "6.9.6", "7.0.0"
+)
 def test_diff_meta(differences_meta):
     assert_diff(differences_meta[-1], "jpeg_image_meta_expected_diff")
 
 
+@skip_unless_tool_is_between(
+    "convert", lambda: imagemagick_version("convert"), "6.9.6", "7.0.0"
+)
 @skip_unless_tools_exist("img2txt", "convert", "identify")
 def test_has_visuals(monkeypatch, image1, image2):
     monkeypatch.setattr(Config(), "compute_visual_diffs", True)

{diffoscope-272 → diffoscope-274}/tests/comparators/test_openssh_pub_key.py

@@ -26,13 +26,19 @@ from diffoscope.comparators.openssh import PublicKeyFile
 from diffoscope.comparators.missing_file import MissingFile
 
 from ..utils.data import assert_diff, load_fixture
-from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
+from ..utils.tools import (
+    skip_unless_tools_exist,
+    skip_unless_tool_is_at_least,
+    skip_unless_tool_is_at_most,
+)
 
 
-# Generated by: ssh-keygen -t rsa -C "Test1"
+# Generated by: ssh-keygen -t dsa -C "Test1"
 opensshpubkey1 = load_fixture("test_openssh_pub_key1.pub")
 # Generated by: ssh-keygen -t rsa -b 4096 -C "Test2"
 opensshpubkey2 = load_fixture("test_openssh_pub_key2.pub")
+# Generated by: ssh-keygen -t ed25519 -C Test3
+opensshpubkey3 = load_fixture("test_openssh_pub_key3.pub")
 
 
 def openssh_version():
@@ -40,29 +46,48 @@ def openssh_version():
     return re.match(r"OpenSSH_([a-zA-Z0-9._+-]+)", out.decode()).group(1)
 
 
-def test_identification(opensshpubkey1):
+def test_identification_dsa(opensshpubkey1):
     assert isinstance(opensshpubkey1, PublicKeyFile)
 
 
+def test_identification_rsa(opensshpubkey1):
+    assert isinstance(opensshpubkey1, PublicKeyFile)
+
+
+def test_identification_ed25519(opensshpubkey3):
+    assert isinstance(opensshpubkey3, PublicKeyFile)
+
+
 def test_no_differences(opensshpubkey1):
     difference = opensshpubkey1.compare(opensshpubkey1)
     assert difference is None
 
 
 @pytest.fixture
-def differences(opensshpubkey1, opensshpubkey2):
+def differences12(opensshpubkey1, opensshpubkey2):
     return opensshpubkey1.compare(opensshpubkey2).details
 
 
+@pytest.fixture
+def differences23(opensshpubkey2, opensshpubkey3):
+    return opensshpubkey2.compare(opensshpubkey3).details
+
+
+@skip_unless_tool_is_at_least("ssh-keygen", openssh_version, "6.9")
+@skip_unless_tool_is_at_most("ssh-keygen", openssh_version, "9.7p1")
+def test_diff12(differences12):
+    assert_diff(differences12[0], "openssh_pub_key_expected_diff_12")
+
+
 @skip_unless_tool_is_at_least("ssh-keygen", openssh_version, "6.9")
-def test_diff(differences):
-    assert_diff(differences[0], "openssh_pub_key_expected_diff")
+def test_diff23(differences23):
+    assert_diff(differences23[0], "openssh_pub_key_expected_diff_23")
 
 
 @skip_unless_tools_exist("ssh-keygen")
-def test_compare_non_existing(monkeypatch, opensshpubkey1):
+def test_compare_non_existing(monkeypatch, opensshpubkey2):
     monkeypatch.setattr(Config(), "new_file", True)
-    difference = opensshpubkey1.compare(
+    difference = opensshpubkey2.compare(
         MissingFile("/nonexisting", opensshpubkey1)
     )
     assert difference.source2 == "/nonexisting"

{diffoscope-272 → diffoscope-274}/tests/comparators/test_zip.py

@@ -44,6 +44,20 @@ def zipdetails_version():
     return subprocess.check_output(["zipdetails", "--version"]).decode("UTF-8")
 
 
+def io_compress_zip_version():
+    try:
+        return subprocess.check_output(
+            [
+                "perl",
+                "-MIO::Compress::Zip",
+                "-e",
+                "print $IO::Compress::Zip::VERSION",
+            ]
+        ).decode("UTF-8")
+    except subprocess.CalledProcessError:
+        return "-1"
+
+
 def test_identification(zip1):
     assert isinstance(zip1, ZipFile)
 
@@ -65,6 +79,7 @@ def differences2(zip1, zip3):
 
 @skip_unless_tools_exist("zipinfo", "zipdetails")
 @skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.004")
+@skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
 def test_metadata(differences):
     assert_diff(differences[0], "zip_zipinfo_expected_diff")
     assert_diff(differences[1], "zip_zipdetails_expected_diff")
@@ -134,6 +149,7 @@ def jmod_differences(jmod1, jmod2):
 
 
 @skip_unless_tools_exist("zipinfo", "zipdetails")
+@skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
 def test_jmod_metadata(jmod_differences, jmod1, jmod2):
     assert_diff(jmod_differences[0], "jmod_zipinfo_expected_diff")
     assert_diff(jmod_differences[1], "jmod_zipdetails_expected_diff")