security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-12 22:11:29 +02:00
Code Activity

tests: Simplify tofu test.

Browse Source 
* tests/openpgp/tofu.scm: Simplify now that we only have one db
format.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-09-12 11:07:48 +02:00
parent eddcba0380
commit aa81e32df7
1 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/openpgp/tofu.scm
View File

@ -95,9 +95,8 @@
(call-check `(,@GPG --trust-model=tofu ,@args (call-check `(,@GPG --trust-model=tofu ,@args
--tofu-policy ,policy ,keyid))) --tofu-policy ,policy ,keyid)))
(for-each-p (info "Checking tofu policies and trust...")
"Testing tofu db"
(lambda (1)
;; Carefully remove the TOFU db. ;; Carefully remove the TOFU db.
(catch '() (unlink (string-append GNUPGHOME "/tofu.db"))) (catch '() (unlink (string-append GNUPGHOME "/tofu.db")))
(catch '() (unlink-recursively (string-append GNUPGHOME "/tofu.d"))) (catch '() (unlink-recursively (string-append GNUPGHOME "/tofu.d")))
@ -121,7 +120,7 @@
;; Change the policy to something other than auto and make sure the ;; Change the policy to something other than auto and make sure the
;; policy and the trust are correct. ;; policy and the trust are correct.
(for-each-p (for-each-p
"" "Setting a fixed policy..."
(lambda (policy) (lambda (policy)
(let ((expected-trust (let ((expected-trust
(cond (cond
@ -160,5 +159,4 @@
--verify ,(in-srcdir "tofu-EE37CF96-1.txt"))) --verify ,(in-srcdir "tofu-EE37CF96-1.txt")))
(checkpolicy "BC15C85A" "ask") (checkpolicy "BC15C85A" "ask")
(checkpolicy "2183839A" "bad") (checkpolicy "2183839A" "bad")
(checkpolicy "EE37CF96" "ask")) (checkpolicy "EE37CF96" "ask")
'("flat"))