[Pkg-gnupg-commit] [gnupg2] 65/124: tests: Fail if we cannot create the socket directory.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit d75d20909d9f60d33ffd210def92278c0f383aad
Author: Justus Winter <justus at g10code.com>
Date:   Mon Mar 20 12:21:43 2017 +0100

    tests: Fail if we cannot create the socket directory.
    
    * tests/migrations/common.scm (run-test): Turn warning into an error.
    * tests/openpgp/defs.scm (start-agent): Likewise.
    --
    
    We use separate directories to create the sockets in so that the
    absolute path to the every socket fits into sun_path.
    
    Fixes-commit: 7e19786a5ddef637d1d9d21593fecf5a36b6f372
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/migrations/common.scm | 2 +-
 tests/openpgp/defs.scm      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/migrations/common.scm b/tests/migrations/common.scm
index fa8f129..b1c90aa 100644
--- a/tests/migrations/common.scm
+++ b/tests/migrations/common.scm
@@ -53,7 +53,7 @@
    (untar-armored src-tarball)
    (setenv "GNUPGHOME" (getcwd) #t)
 
-   (catch (log "Warning: Creating socket directory failed:" (car *error*))
+   (catch (fail "Creating socket directory failed (see README):" (car *error*))
 	  (call-popen `(,gpgconf --create-socketdir) ""))
    (test (getcwd))
    (catch (log "Warning: Removing socket directory failed.")
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 7c8e10a..64c086d 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -446,7 +446,7 @@
     (atexit (lambda ()
 	      (with-home-directory gnupghome
 				   (stop-agent)))))
-  (catch (log "Warning: Creating socket directory failed:" (car *error*))
+  (catch (fail "Creating socket directory failed (see README):" (car *error*))
 	 (call-popen `(,(tool 'gpgconf) --create-socketdir) ""))
   (call-check `(,(tool 'gpg-connect-agent) --verbose
 		,(string-append "--agent-program=" (tool 'gpg-agent)

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