[Pkg-gnupg-commit] [gnupg2] 103/292: tests: Rework test environment setup.

[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 cbbf0a7a8da1757fea29cff0daaa42a6bbb95b26
Author: Justus Winter <justus at g10code.com>
Date:   Fri Oct 7 16:17:49 2016 +0200

    tests: Rework test environment setup.
    
    * tests/openpgp/setup.scm: Import one keyring at a time.  This works
    around a yet to be investigated hang on Windows.  It is also much
    prettier.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/openpgp/setup.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/openpgp/setup.scm b/tests/openpgp/setup.scm
index 0a9a153..75310d1 100755
--- a/tests/openpgp/setup.scm
+++ b/tests/openpgp/setup.scm
@@ -84,11 +84,12 @@
 		 "C6A6390E9388CDBAD71EAEA698233FE5E04F001E"
 		 "D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3"))
 
-  (info "Importing public demo and test keys")
-  (call-check `(, at GPG --yes --import
-		      ,(in-srcdir "pubdemo.asc")
-		      ,(in-srcdir "pubring.asc")
-		      ,(in-srcdir key-file1)))
+  (for-each-p
+   "Importing public demo and test keys"
+   (lambda (file)
+     (call-check `(, at GPG --yes --import ,(in-srcdir file))))
+   (list "pubdemo.asc" "pubring.asc" key-file1))
+
   (pipe:do
    (pipe:open (in-srcdir "pubring.pkr.asc") (logior O_RDONLY O_BINARY))
    (pipe:spawn `(, at GPG --dearmor))

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