Your message dated Fri, 11 Sep 2020 09:34:51 +0000 with message-id <[email protected]> and subject line Bug#969753: fixed in diffoscope 160 has caused the Debian Bug report #969753, regarding diffoscope: autopkgtest failures to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 969753: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=969753 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Source: diffoscope Version: 159 Severity: serious Hello, autopkgtests looks sad, pytest-with-recommends works, while pytest doesn't, because of missing pgpdump I did add some @skip_unless_tools_exist("pgpdump") around the failing tests (attached the diff), however I don't know if this is the right solution, or something better has to be implemented. G.diff -Nru diffoscope-158/debian/changelog diffoscope-158ubuntu1/debian/changelog --- diffoscope-158/debian/changelog 2020-08-28 12:53:10.000000000 +0200 +++ diffoscope-158ubuntu1/debian/changelog 2020-09-07 20:46:23.000000000 +0200 @@ -1,3 +1,9 @@ +diffoscope (159ubuntu1) groovy; urgency=medium + + * Skip some tests if pgpdump is not installed + + -- Gianfranco Costamagna <[email protected]> Mon, 07 Sep 2020 20:46:23 +0200 + diffoscope (159) unstable; urgency=medium [ Chris Lamb ] diff -Nru diffoscope-158/tests/comparators/test_binary.py diffoscope-158ubuntu1/tests/comparators/test_binary.py --- diffoscope-158/tests/comparators/test_binary.py 2020-08-28 12:53:10.000000000 +0200 +++ diffoscope-158ubuntu1/tests/comparators/test_binary.py 2020-09-07 20:01:52.000000000 +0200 @@ -48,10 +48,12 @@ binary2 = init_fixture(TEST_FILE2_PATH) +@skip_unless_tools_exist("pgpdump") def test_same_content(binary1): assert binary1.has_same_content_as(binary1) is True +@skip_unless_tools_exist("pgpdump") def test_not_same_content(binary1, binary2): assert binary1.has_same_content_as(binary2) is False @@ -76,18 +78,20 @@ assert File.guess_encoding(TEST_ISO8859_PATH) == "iso-8859-1" -def test_no_differences_with_xxd(binary1): +@skip_unless_tools_exist("pgpdump") +def test_no_differences_with_xxd(binary1): difference = binary1.compare_bytes(binary1) assert difference is None -@skip_unless_tools_exist("xxd") +@skip_unless_tools_exist("xxd", "pgpdump") def test_compare_with_xxd(binary1, binary2): difference = binary1.compare_bytes(binary2) expected_diff = get_data("binary_expected_diff") assert normalize_zeros(difference.unified_diff) == expected_diff +@skip_unless_tools_exist("pgpdump") def test_compare_non_existing_with_xxd(binary1): difference = binary1.compare_bytes(MissingFile("/nonexisting", binary1)) assert difference.source2 == "/nonexisting" @@ -101,11 +105,13 @@ monkeypatch.setattr(Xxd, "cmdline", mock_cmdline) +@skip_unless_tools_exist("pgpdump") def test_no_differences_without_xxd(xxd_not_found, binary1): difference = binary1.compare_bytes(binary1) assert difference is None +@skip_unless_tools_exist("pgpdump") def test_compare_without_xxd(xxd_not_found, binary1, binary2): difference = binary1.compare(binary2) expected_diff = get_data("binary_hexdump_expected_diff") diff -Nru diffoscope-158/tests/comparators/test_haskell.py diffoscope-158ubuntu1/tests/comparators/test_haskell.py --- diffoscope-158/tests/comparators/test_haskell.py 2020-08-28 12:53:10.000000000 +0200 +++ diffoscope-158ubuntu1/tests/comparators/test_haskell.py 2020-09-07 20:03:29.000000000 +0200 @@ -38,6 +38,7 @@ assert isinstance(haskell1, HiFile) +@skip_unless_tools_exist("pgpdump") def test_no_differences(haskell1): assert haskell1.compare(haskell1) is None diff -Nru diffoscope-158/tests/comparators/test_pgp.py diffoscope-158ubuntu1/tests/comparators/test_pgp.py --- diffoscope-158/tests/comparators/test_pgp.py 2020-08-28 12:53:10.000000000 +0200 +++ diffoscope-158ubuntu1/tests/comparators/test_pgp.py 2020-09-07 20:43:15.000000000 +0200 @@ -70,6 +70,7 @@ assert len(difference.details) == 1 +@skip_unless_tools_exist("pgpdump") def test_signed_identification(signed1): assert isinstance(signed1, PgpFile) diff -Nru diffoscope-158/tests/comparators/test_ppu.py diffoscope-158ubuntu1/tests/comparators/test_ppu.py --- diffoscope-158/tests/comparators/test_ppu.py 2020-08-28 12:53:10.000000000 +0200 +++ diffoscope-158ubuntu1/tests/comparators/test_ppu.py 2020-09-07 20:44:53.000000000 +0200 @@ -51,6 +51,7 @@ assert isinstance(file1, PpuFile) +@skip_unless_tools_exist("pgpdump") def test_no_differences(file1): assert file1.compare(file1) is None diff -Nru diffoscope-158/tests/comparators/test_rlib.py diffoscope-158ubuntu1/tests/comparators/test_rlib.py --- diffoscope-158/tests/comparators/test_rlib.py 2020-08-28 12:53:10.000000000 +0200 +++ diffoscope-158ubuntu1/tests/comparators/test_rlib.py 2020-09-07 20:46:22.000000000 +0200 @@ -80,12 +80,12 @@ return get_data(diff_file) -@skip_unless_tools_exist("nm") +@skip_unless_tools_exist("nm", "pgpdump") def test_num_items(differences): assert len(differences) == 4 -@skip_unless_tools_exist("nm") +@skip_unless_tools_exist("nm", "pgpdump") @skip_if_binutils_does_not_support_x86() def test_item0_armap(differences): assert differences[0].source1 == "nm -s {}" @@ -94,7 +94,7 @@ assert differences[0].unified_diff == expected_diff -@skip_unless_tools_exist("nm") +@skip_unless_tools_exist("nm", "pgpdump") @skip_if_binutils_does_not_support_x86() def test_item1_elf(differences): assert differences[1].source1 == "alloc_system-d16b8f0e.0.o" @@ -103,7 +103,7 @@ assert differences[1].details[0].unified_diff == expected_diff -@skip_unless_tools_exist("nm") +@skip_unless_tools_exist("nm", "pgpdump") def test_item2_rust_metadata_bin(differences): assert differences[2].source1 == "rust.metadata.bin" assert differences[2].source2 == "rust.metadata.bin"
--- End Message ---
--- Begin Message ---Source: diffoscope Source-Version: 160 Done: Chris Lamb <[email protected]> We believe that the bug you reported is fixed in the latest version of diffoscope, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Chris Lamb <[email protected]> (supplier of updated diffoscope package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Fri, 11 Sep 2020 10:08:38 +0100 Source: diffoscope Built-For-Profiles: nocheck Architecture: source Version: 160 Distribution: unstable Urgency: medium Maintainer: Reproducible builds folks <[email protected]> Changed-By: Chris Lamb <[email protected]> Closes: 969753 Changes: diffoscope (160) unstable; urgency=medium . * Check that pgpdump is actually installed before attempting to run it. Thanks to Gianfranco Costamagna (locutusofborg). (Closes: #969753) * Add some documentation for the EXTERNAL_TOOLS dictionary. * Ensure we check FALLBACK_FILE_EXTENSION_SUFFIX, otherwise we run pgpdump against all files that are recognised by file(1) as "data". Checksums-Sha1: c69615b6f2a084807567cfa7d67c6bcad5614aa7 4807 diffoscope_160.dsc d1cd0945901f4d5daebaad7875b2ca9cf53de22f 984740 diffoscope_160.tar.xz eff483b199ae3a9a3597333b8e051e6cdefeadae 6200 diffoscope_160_amd64.buildinfo Checksums-Sha256: 26213c1c398085e04b5bbfa56cd3be292a6d6ca61a45c1e49823e4e015c0a7aa 4807 diffoscope_160.dsc 1ca57ccf204cef2b5b275f64fb3fb14714511dfb0c261de57c281ac6c26b6541 984740 diffoscope_160.tar.xz 5e241d14eac97b7528542af395f07c1e47bb011f4db8832939773f99e65d44f8 6200 diffoscope_160_amd64.buildinfo Files: 54dca34e7a53b7b5120074aa1a387a62 4807 devel optional diffoscope_160.dsc 72d65b5a24d36a1451a7ed7ab49deda4 984740 devel optional diffoscope_160.tar.xz 8ef679e9dbafe0446fcc2277ef1c07b9 6200 devel optional diffoscope_160_amd64.buildinfo -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAl9bQJ4ACgkQHpU+J9Qx HliRIg//eZ3WsqmQn/8HF2C4pwmQrD5TwVWw4JNQyqS+QQjk+uyiHSH8or6UcjI4 wpMy7/QvDNUzB+1+ZvPVZdltTnsxArF6NUGoFqkH2y6zs42ltewc5x3ZwIwO54wI SQ0V3s7wcWqMzCPSgVvIxDZXA+RRMe0widcHqyFTnb4GuD0Nt6flWAokDds3ZpFH 7OBAK2FigMhytjRxXhiswmvdSFKngkfj418Ub8hq10T17Eo0awTTpdVVuityEr/d 9b5P5vnmt1S1XFoBB7I1Gp6oNPswF5pGS14BlHvOP5rjJx66HbBg4vqZlw93VzdW CaLwmYlhD4D/VR0m/1s9RNFKlqgHC21uKBOucfjq5ANmAi7zipNvqMhjtlWqEAQW o4qmt6CIrPdHp7AMHjHMuY0Spv9dufuhhsp/mnEhiHbCbGY3aX518DfjVP1/kB1f whHmI4nqRDfI4ayzaxpxQiWt2Xvh8ys+FHO8WihGfwBo1cSPcpmaQ91GMACwefm4 CQRePE2wr/l7xG36Wf5jvk3gbYTlLVJ8Qym7snU9EClXa0lX8NBjiP8Y3/rkPVpk QOO+ZjrnypmQKHpCUK/mO59AEzxAtw32GJGIrruabiMke868cSZgDH8kNlFqoaWq zAgLTm3UZn+FMyw+Oj+PU0+sEbEctkXIHIqSc64LiS5L0gidqC0= =4/dN -----END PGP SIGNATURE-----
--- End Message ---
