MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #150243 from primeos/diffoscope-fix-pgp-test

Browse source 
diffoscope: Fix the OpenPGP test which broke with pgpdump 0.34
This commit is contained in:
Michael Weiss 2021-12-11 15:21:47 +01:00 committed by GitHub
commit 0836af299a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/tools/misc/diffoscope/fix-tests.patch
View file

@ -12,3 +12,22 @@ index 8d201ab..05960aa 100644
return get_data(diff_file) return get_data(diff_file)
diff --git a/tests/data/pgp_signed_expected_diff b/tests/data/pgp_signed_expected_diff
index 7e90e428..9628efa0 100644
--- a/tests/data/pgp_signed_expected_diff
+++ b/tests/data/pgp_signed_expected_diff
@@ -5,11 +5,11 @@
Key ID - 0x1E953E27D4311E58
Next packet - other than one pass signature
Old: Literal Data Packet(tag 11)(10255 bytes)
- Format - binary
+ Packet data format - binary
- Filename - test1.tar
-- File modified time - Tue Aug 25 11:47:35 UTC 2020
+- Creation time - Tue Aug 25 11:47:35 UTC 2020
+ Filename - test2.tar
-+ File modified time - Tue Aug 25 11:47:38 UTC 2020
++ Creation time - Tue Aug 25 11:47:38 UTC 2020
Literal - ...
Old: Signature Packet(tag 2)(563 bytes)
Ver 4 - new