diff options
| author | Justus Winter <[email protected]> | 2016-06-23 15:24:23 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-06-23 15:42:30 +0000 |
| commit | e584d6468a2e72cd01e55f46104f9f96b56c0b66 (patch) | |
| tree | 4e773c19bca717c623f2bf22d90b24665b23d731 | |
| parent | gpgscm: Handle exceptions in the transformation monad. (diff) | |
| download | gnupg-e584d6468a2e72cd01e55f46104f9f96b56c0b66.tar.gz gnupg-e584d6468a2e72cd01e55f46104f9f96b56c0b66.zip | |
tests/openpgp: Fake the system time for the tofu test.
The keys in the tofu test are set to expire on 2016-09-17. Fake the
system time for this test.
This commit includes changes to the old test as well, for those who
need to backport it.
* tests/openpgp/gpg-agent.conf.tmpl: Drop trailing newlines.
* tests/openpgp/tofu.scm: Fake system time.
* tests/openpgp/tofu.test: Likewise.
GnuPG-bug-id: 2393
Signed-off-by: Justus Winter <[email protected]>
| -rw-r--r-- | tests/openpgp/gpg-agent.conf.tmpl | 2 | ||||
| -rwxr-xr-x | tests/openpgp/tofu.scm | 4 | ||||
| -rwxr-xr-x | tests/openpgp/tofu.test | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tests/openpgp/gpg-agent.conf.tmpl b/tests/openpgp/gpg-agent.conf.tmpl index b3cb54f09..70e163317 100644 --- a/tests/openpgp/gpg-agent.conf.tmpl +++ b/tests/openpgp/gpg-agent.conf.tmpl @@ -1,4 +1,2 @@ allow-preset-passphrase no-grab - - diff --git a/tests/openpgp/tofu.scm b/tests/openpgp/tofu.scm index 24fa9df02..38b6a0f0f 100755 --- a/tests/openpgp/tofu.scm +++ b/tests/openpgp/tofu.scm @@ -19,7 +19,9 @@ (load (with-path "defs.scm")) -(define GPG `(,(tool 'gpg) --no-permission-warning)) ;; w/o --always-trust + ;; Redefine GPG without --always-trust and a fixed time. +(define GPG `(,(tool 'gpg) --no-permission-warning + --faked-system-time=1466684990)) (define GNUPGHOME (getenv "GNUPGHOME")) (if (string=? "" GNUPGHOME) (error "GNUPGHOME not set")) diff --git a/tests/openpgp/tofu.test b/tests/openpgp/tofu.test index 18c17562c..0d34af409 100755 --- a/tests/openpgp/tofu.test +++ b/tests/openpgp/tofu.test @@ -4,6 +4,9 @@ # set -x +# Redefine GPG with a fixed time. +GPG="$GPG --faked-system-time=1466684990" + KEYS="2183839A BC15C85A EE37CF96" # Make sure $srcdir is set. |