diff options
Diffstat (limited to '')
| -rwxr-xr-x | tests/openpgp/quick-key-manipulation.scm | 67 |
1 files changed, 31 insertions, 36 deletions
diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm index 8a3e3f1f7..b6411d0b7 100755 --- a/tests/openpgp/quick-key-manipulation.scm +++ b/tests/openpgp/quick-key-manipulation.scm @@ -33,55 +33,50 @@ `(--with-fingerprint --list-secret-keys ,(exact id)))))) -(define old-home (getenv "GNUPGHOME")) -(define alpha "Alpha <[email protected]>") -(define bravo "Bravo <[email protected]>") +(define alpha "Alpha <[email protected]>") +(define bravo "Bravo <[email protected]>") (define (key-data key) (filter (lambda (x) (or (string=? (car x) "pub") (string=? (car x) "sub"))) (gpg-with-colons `(-k ,key)))) -(with-temporary-working-directory - (file-copy (path-join old-home "gpg.conf") "gpg.conf") - (file-copy (path-join old-home "gpg-agent.conf") "gpg-agent.conf") - (setenv "GNUPGHOME" "." #t) - (setenv "PINENTRY_USER_DATA" "test" #t) +(setenv "PINENTRY_USER_DATA" "test" #t) - (info "Checking quick key generation...") - (call-check `(,@GPG --quick-gen-key ,alpha)) +(info "Checking quick key generation...") +(call-check `(,@GPG --quick-gen-key ,alpha)) - (call-check `(,@GPG --check-trustdb)) ; XXX why? +(call-check `(,@GPG --check-trustdb)) ; XXX why? - (assert (= 1 (count-uids-of-secret-key alpha))) +(assert (= 1 (count-uids-of-secret-key alpha))) - (info "Checking that we can add a user ID...") +(info "Checking that we can add a user ID...") - ;; Make sure the key capabilities don't change when we add a user id. - ;; (See bug #2697.) - (let ((pre (key-data (exact alpha))) - (result (call-check `(,@GPG --quick-adduid ,(exact alpha) ,bravo))) - (post (key-data (exact alpha)))) - (if (not (equal? pre post)) - (begin - (display "Key capabilities changed when adding a user id:") - (newline) - (display " Pre: ") - (display pre) - (newline) - (display " Post: ") - (display post) - (newline) - (exit 1)))) +;; Make sure the key capabilities don't change when we add a user id. +;; (See bug #2697.) +(let ((pre (key-data (exact alpha))) + (result (call-check `(,@GPG --quick-adduid ,(exact alpha) ,bravo))) + (post (key-data (exact alpha)))) + (if (not (equal? pre post)) + (begin + (display "Key capabilities changed when adding a user id:") + (newline) + (display " Pre: ") + (display pre) + (newline) + (display " Post: ") + (display post) + (newline) + (exit 1)))) - (call-check `(,@GPG --check-trustdb)) ; XXX why? +(call-check `(,@GPG --check-trustdb)) ; XXX why? - (assert (= 2 (count-uids-of-secret-key alpha))) - (assert (= 2 (count-uids-of-secret-key bravo))) +(assert (= 2 (count-uids-of-secret-key alpha))) +(assert (= 2 (count-uids-of-secret-key bravo))) - (info "Checking that we can revoke a user ID...") - (call-check `(,@GPG --quick-revuid ,(exact bravo) ,alpha)) +(info "Checking that we can revoke a user ID...") +(call-check `(,@GPG --quick-revuid ,(exact bravo) ,alpha)) - (call-check `(,@GPG --check-trustdb)) ; XXX why? +(call-check `(,@GPG --check-trustdb)) ; XXX why? - (assert (= 1 (count-uids-of-secret-key bravo)))) +(assert (= 1 (count-uids-of-secret-key bravo))) |