[Pkg-gnupg-commit] [gnupg2] 114/292: tests: Use shorter filenames.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Nov 21 06:31:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit 0c56ad5a8d89d69a9ed00571720b3b105f955214
Author: Neal H. Walfield <neal at g10code.com>
Date: Thu Oct 13 21:38:50 2016 +0200
tests: Use shorter filenames.
* tests/openpgp/tofu/cross-sigs/
1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg: Rename from this...
* tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg: .. to this.
* tests/openpgp/tofu/cross-sigs/
1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt: Rename from this...
* tests/openpgp/tofu/cross-sigs/EC38277E-1.txt: .. to this.
* tests/openpgp/tofu/cross-sigs/
1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg: Rename from this...
* tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg: .. to this.
* tests/openpgp/tofu/cross-sigs/
1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt: Rename from this...
* tests/openpgp/tofu/cross-sigs/EC38277E-2.txt: .. to this.
* tests/openpgp/tofu/cross-sigs/
1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt: Rename from this...
* tests/openpgp/tofu/cross-sigs/EC38277E-3.txt: .. to this.
* tests/openpgp/tofu/cross-sigs/
1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg: Rename from
this...
* tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg: .. to this.
* tests/openpgp/tofu/cross-sigs/
DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg: Rename from this...
* tests/openpgp/tofu/cross-sigs/871C2247-1.gpg: .. to this.
* tests/openpgp/tofu/cross-sigs/
DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt: Rename from this...
* tests/openpgp/tofu/cross-sigs/871C2247-1.txt: .. to this.
* tests/openpgp/tofu/cross-sigs/
DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg: Rename from this...
* tests/openpgp/tofu/cross-sigs/871C2247-2.gpg: .. to this.
* tests/openpgp/tofu/cross-sigs/
DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt: Rename from this...
* tests/openpgp/tofu/cross-sigs/871C2247-2.txt: .. to this.
* tests/openpgp/tofu/cross-sigs/
DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg: Rename from this...
* tests/openpgp/tofu/cross-sigs/871C2247-3.gpg: .. to this.
* tests/openpgp/tofu/cross-sigs/
DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt: Rename from this...
* tests/openpgp/tofu/cross-sigs/871C2247-3.txt: .. to this.
* tests/openpgp/tofu/cross-sigs/
DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg: Rename from this...
* tests/openpgp/tofu/cross-sigs/871C2247-4.gpg: .. to this.
* tests/openpgp/tofu/cross-sigs/
DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg: Rename from
this...
* tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg: .. to this.
* tests/openpgp/Makefile.am (TEST_FILES): Update accordingly.
--
Signed-off-by: Neal H. Walfield <neal at g10code.com>
Fixed-commit: d2d936fbe86d61b89cead95df633b2b575690e05
---
tests/openpgp/Makefile.am | 28 ++++++++--------
tests/openpgp/tofu.scm | 36 ++++++++++-----------
...76E8BA8B48C6BD871C2247-1.gpg => 871C2247-1.gpg} | Bin
...76E8BA8B48C6BD871C2247-1.txt => 871C2247-1.txt} | Bin
...76E8BA8B48C6BD871C2247-2.gpg => 871C2247-2.gpg} | Bin
...76E8BA8B48C6BD871C2247-2.txt => 871C2247-2.txt} | Bin
...76E8BA8B48C6BD871C2247-3.gpg => 871C2247-3.gpg} | Bin
...7AC0B987DB2814EC38277E-3.txt => 871C2247-3.txt} | Bin
...76E8BA8B48C6BD871C2247-4.gpg => 871C2247-4.gpg} | Bin
...C6BD871C2247-secret.gpg => 871C2247-secret.gpg} | Bin
...7AC0B987DB2814EC38277E-1.gpg => EC38277E-1.gpg} | Bin
...7AC0B987DB2814EC38277E-1.txt => EC38277E-1.txt} | Bin
...7AC0B987DB2814EC38277E-2.gpg => EC38277E-2.gpg} | Bin
...7AC0B987DB2814EC38277E-2.txt => EC38277E-2.txt} | Bin
...76E8BA8B48C6BD871C2247-3.txt => EC38277E-3.txt} | Bin
...2814EC38277E-secret.gpg => EC38277E-secret.gpg} | Bin
16 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index be110fb..bb9b2f4 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -110,20 +110,20 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc \
tofu-keys.asc tofu-keys-secret.asc \
tofu-2183839A-1.txt tofu-BC15C85A-1.txt tofu-EE37CF96-1.txt \
- tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg \
- tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg \
- tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt \
- tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg \
- tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt \
- tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt \
- tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg \
- tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg \
- tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt \
- tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg \
- tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt \
- tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg \
- tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt \
- tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg \
+ tofu/cross-sigs/EC38277E-secret.gpg \
+ tofu/cross-sigs/EC38277E-1.gpg \
+ tofu/cross-sigs/EC38277E-1.txt \
+ tofu/cross-sigs/EC38277E-2.gpg \
+ tofu/cross-sigs/EC38277E-2.txt \
+ tofu/cross-sigs/EC38277E-3.txt \
+ tofu/cross-sigs/871C2247-secret.gpg \
+ tofu/cross-sigs/871C2247-1.gpg \
+ tofu/cross-sigs/871C2247-1.txt \
+ tofu/cross-sigs/871C2247-2.gpg \
+ tofu/cross-sigs/871C2247-2.txt \
+ tofu/cross-sigs/871C2247-3.gpg \
+ tofu/cross-sigs/871C2247-3.txt \
+ tofu/cross-sigs/871C2247-4.gpg \
tofu/cross-sigs/README
data_files = data-500 data-9000 data-32000 data-80000 plain-large
diff --git a/tests/openpgp/tofu.scm b/tests/openpgp/tofu.scm
index 2939250..3cca189 100755
--- a/tests/openpgp/tofu.scm
+++ b/tests/openpgp/tofu.scm
@@ -179,6 +179,8 @@
;; The test keys.
(define KEYA "1938C3A0E4674B6C217AC0B987DB2814EC38277E")
(define KEYB "DC463A16E42F03240D76E8BA8B48C6BD871C2247")
+(define KEYIDA (substring KEYA (- (string-length KEYA) 8)))
+(define KEYIDB (substring KEYB (- (string-length KEYB) 8)))
(define (verify-messages)
(for-each
@@ -188,12 +190,12 @@
(let ((fn (in-srcdir DIR (string-append key "-" i ".txt"))))
(call-check `(, at GPG --trust-model=tofu --verify ,fn))))
(list "1" "2")))
- (list KEYA KEYB)))
+ (list KEYIDA KEYIDB)))
;; Import the public keys.
(display " > Two keys. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-1.gpg"))))
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-1.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDA "-1.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-1.gpg"))))
;; Make sure the tofu engine registers the keys.
(verify-messages)
(display "<\n")
@@ -204,8 +206,8 @@
;; Import the cross sigs.
(display " > Adding cross signatures. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-2.gpg"))))
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-2.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDA "-2.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-2.gpg"))))
(verify-messages)
(display "<\n")
@@ -215,9 +217,7 @@
;; Import the conflicting user id.
(display " > Adding conflicting user id. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-3.gpg"))))
-(call-check `(, at GPG --trust-model=tofu
- --verify ,(in-srcdir DIR (string-append KEYB "-1.txt"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-3.gpg"))))
(verify-messages)
(display "<\n")
@@ -226,7 +226,7 @@
;; Import Alice's signature on the conflicting user id.
(display " > Adding cross signature on user id. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-4.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-4.gpg"))))
(verify-messages)
(display "<\n")
@@ -255,6 +255,8 @@
;; The test keys.
(define KEYA "1938C3A0E4674B6C217AC0B987DB2814EC38277E")
(define KEYB "DC463A16E42F03240D76E8BA8B48C6BD871C2247")
+(define KEYIDA (substring KEYA (- (string-length KEYA) 8)))
+(define KEYIDB (substring KEYB (- (string-length KEYB) 8)))
(define (verify-messages)
(for-each
@@ -264,18 +266,18 @@
(let ((fn (in-srcdir DIR (string-append key "-" i ".txt"))))
(call-check `(, at GPG --trust-model=tofu --verify ,fn))))
(list "1" "2")))
- (list KEYA KEYB)))
+ (list KEYIDA KEYIDB)))
;; Import the public keys.
(display " > Two keys. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-1.gpg"))))
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-1.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDA "-1.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-1.gpg"))))
(display "<\n")
;; Import the cross sigs.
(display " > Adding cross signatures. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYA "-2.gpg"))))
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-2.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDA "-2.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-2.gpg"))))
(display "<\n")
;; Make KEYA ultimately trusted.
@@ -293,9 +295,7 @@
;; Import the conflicting user id.
(display " > Adding conflicting user id. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-3.gpg"))))
-(call-check `(, at GPG --trust-model=tofu
- --verify ,(in-srcdir DIR (string-append KEYB "-1.txt"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-3.gpg"))))
(verify-messages)
(display "<\n")
@@ -304,7 +304,7 @@
;; Import Alice's signature on the conflicting user id.
(display " > Adding cross signature on user id. ")
-(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYB "-4.gpg"))))
+(call-check `(, at GPG --import ,(in-srcdir DIR (string-append KEYIDB "-4.gpg"))))
(verify-messages)
(display "<\n")
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-1.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg
rename to tests/openpgp/tofu/cross-sigs/871C2247-1.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt b/tests/openpgp/tofu/cross-sigs/871C2247-1.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt
rename to tests/openpgp/tofu/cross-sigs/871C2247-1.txt
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-2.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg
rename to tests/openpgp/tofu/cross-sigs/871C2247-2.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt b/tests/openpgp/tofu/cross-sigs/871C2247-2.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt
rename to tests/openpgp/tofu/cross-sigs/871C2247-2.txt
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-3.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg
rename to tests/openpgp/tofu/cross-sigs/871C2247-3.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt b/tests/openpgp/tofu/cross-sigs/871C2247-3.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt
rename to tests/openpgp/tofu/cross-sigs/871C2247-3.txt
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-4.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg
rename to tests/openpgp/tofu/cross-sigs/871C2247-4.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg
rename to tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg b/tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg
rename to tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt b/tests/openpgp/tofu/cross-sigs/EC38277E-1.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt
rename to tests/openpgp/tofu/cross-sigs/EC38277E-1.txt
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg b/tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg
rename to tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt b/tests/openpgp/tofu/cross-sigs/EC38277E-2.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt
rename to tests/openpgp/tofu/cross-sigs/EC38277E-2.txt
diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt b/tests/openpgp/tofu/cross-sigs/EC38277E-3.txt
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt
rename to tests/openpgp/tofu/cross-sigs/EC38277E-3.txt
diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg b/tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg
similarity index 100%
rename from tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg
rename to tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list