From 1b28d9dbe0260b2a4645c4b5caae11d9f375c942 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 11 Apr 2017 10:46:09 +0200 Subject: tests: Make tests more robust. * tests/openpgp/defs.scm (have-opt-always-trust): Execute in empty ephemeral home directory. This prevents gpg from picking up the configuration from the current gnupghome (if any). * tests/migrations/common.scm (untar-armored): Likewise. Signed-off-by: Justus Winter --- tests/migrations/common.scm | 9 +++++---- tests/openpgp/defs.scm | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/migrations/common.scm b/tests/migrations/common.scm index fa8f1295a..cba659024 100644 --- a/tests/migrations/common.scm +++ b/tests/migrations/common.scm @@ -39,10 +39,11 @@ (define GPGTAR (path-join (getenv "objdir") "tools" (qualify "gpgtar"))) (define (untar-armored source-name) - (pipe:do - (pipe:open source-name (logior O_RDONLY O_BINARY)) - (pipe:spawn `(,@GPG --dearmor)) - (pipe:spawn `(,GPGTAR --extract --directory=. -)))) + (with-ephemeral-home-directory (lambda ()) + (pipe:do + (pipe:open source-name (logior O_RDONLY O_BINARY)) + (pipe:spawn `(,@GPG --dearmor)) + (pipe:spawn `(,GPGTAR --extract --directory=. -))))) (define (run-test message src-tarball test) (catch (skip "gpgtar not built") diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm index cb22de7d8..c4b321ca0 100644 --- a/tests/openpgp/defs.scm +++ b/tests/openpgp/defs.scm @@ -201,7 +201,8 @@ (define have-opt-always-trust (catch #f - (call-check `(,(tool 'gpg) --gpgconf-test --always-trust)) + (with-ephemeral-home-directory (lambda ()) + (call-check `(,(tool 'gpg) --gpgconf-test --always-trust))) #t)) (define GPG `(,(tool 'gpg) --no-permission-warning -- cgit v1.2.3