mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
tests: Simplify test.
* tests/openpgp/quick-key-manipulation.scm: Avoid creating a temporary home directory, just make the uids unique. Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
parent
ca9597f080
commit
71158d8d5f
@ -33,55 +33,50 @@
|
||||
`(--with-fingerprint
|
||||
--list-secret-keys ,(exact id))))))
|
||||
|
||||
(define old-home (getenv "GNUPGHOME"))
|
||||
(define alpha "Alpha <alpha@example.net>")
|
||||
(define bravo "Bravo <bravo@example.net>")
|
||||
(define alpha "Alpha <alpha@invalid.example.net>")
|
||||
(define bravo "Bravo <bravo@invalid.example.net>")
|
||||
|
||||
(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)))
|
||||
|
Loading…
x
Reference in New Issue
Block a user