git.iko.soy/typeable/nixpkgs
on master help sign in
diffoscope: Fix the OpenPGP test which broke with pgpdump 0.34

This fixes a regression from the last pgpdump update: 816d311bd07 See https://github.com/NixOS/nixpkgs/pull/149700#issuecomment-991592708 Reported-by: Sergei Trofimovich <slyich@gmail.com>

commit0ba695d90eff1a5a16e609f353af8c1d5d5c1497 authorMichael Weiss <dev.primeos@gmail.com> dateSat 11 Dec 2021, 14:02 (5 years ago) parent1b11583
1 file changed+19
compare with master
unifiedsplit
pkgs/tools/misc/diffoscope/fix-tests.patch+19
pkgs/tools/misc/diffoscope/fix-tests.patch+19
@@ -12,3 +12,22 @@ index 8d201ab..05960aa 100644
1212 return get_data(diff_file)
1313
1414
15+diff --git a/tests/data/pgp_signed_expected_diff b/tests/data/pgp_signed_expected_diff
16+index 7e90e428..9628efa0 100644
17+--- a/tests/data/pgp_signed_expected_diff
18++++ b/tests/data/pgp_signed_expected_diff
19+@@ -5,11 +5,11 @@
20+ Key ID - 0x1E953E27D4311E58
21+ Next packet - other than one pass signature
22+ Old: Literal Data Packet(tag 11)(10255 bytes)
23+- Format - binary
24++ Packet data format - binary
25+ - Filename - test1.tar
26+-- File modified time - Tue Aug 25 11:47:35 UTC 2020
27++- Creation time - Tue Aug 25 11:47:35 UTC 2020
28+ + Filename - test2.tar
29+-+ File modified time - Tue Aug 25 11:47:38 UTC 2020
30+++ Creation time - Tue Aug 25 11:47:38 UTC 2020
31+ Literal - ...
32+ Old: Signature Packet(tag 2)(563 bytes)
33+ Ver 4 - new