summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <justus@g10code.com>2017-03-20 12:21:43 +0100
committerJustus Winter <justus@g10code.com>2017-03-20 14:09:13 +0100
commitd75d20909d9f60d33ffd210def92278c0f383aad (patch)
tree741fa8e52dbd1cd40f5ff783558fb042537b7b34
parentgpg: Add new field no 18 to the colon listing. (diff)
downloadgnupg2-d75d20909d9f60d33ffd210def92278c0f383aad.tar.xz
gnupg2-d75d20909d9f60d33ffd210def92278c0f383aad.zip
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@g10code.com>
-rw-r--r--tests/migrations/common.scm2
-rw-r--r--tests/openpgp/defs.scm2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/migrations/common.scm b/tests/migrations/common.scm
index fa8f1295a..b1c90aa04 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 7c8e10a7e..64c086d8c 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)