[Pkg-gnupg-commit] [gnupg2] 64/180: tests: Improve quick key manipulation test.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 92df40a3a2ae471fbba00d6d7040230404931fd4
Author: Justus Winter <justus at g10code.com>
Date:   Wed Dec 7 14:49:49 2016 +0100

    tests: Improve quick key manipulation test.
    
    * tests/openpgp/quick-key-manipulation.scm: Do not update the trust
    database, rather be more specific when filtering the user ids.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/openpgp/quick-key-manipulation.scm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm
index 4579081..4f0eec2 100755
--- a/tests/openpgp/quick-key-manipulation.scm
+++ b/tests/openpgp/quick-key-manipulation.scm
@@ -29,7 +29,7 @@
 
 (define (count-uids-of-secret-key id)
   (length (filter (lambda (x) (and (string=? "uid" (car x))
-				   (string=? "u" (cadr x))))
+				   (not (string=? "r" (cadr x)))))
 		  (gpg-with-colons
 		   `(--with-fingerprint
 		     --list-secret-keys ,(exact id))))))
@@ -47,8 +47,6 @@
 (info "Checking quick key generation...")
 (call-check `(, at GPG --quick-gen-key ,alpha))
 
-(call-check `(, at GPG --check-trustdb)) ; XXX why?
-
 (assert (= 1 (count-uids-of-secret-key alpha)))
 
 (info "Checking that we can add a user ID...")
@@ -70,14 +68,10 @@
 	(newline)
 	(exit 1))))
 
-(call-check `(, at GPG --check-trustdb)) ; XXX why?
-
 (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 `(, at GPG --quick-revuid ,(exact bravo) ,alpha))
 
-(call-check `(, at GPG --check-trustdb)) ; XXX why?
-
 (assert (= 1 (count-uids-of-secret-key bravo)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git