diff options
| author | Justus Winter <[email protected]> | 2016-12-06 14:21:30 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-12-06 14:25:55 +0000 |
| commit | 5b5d881f47c82f320abf440c20b7a1bac078a987 (patch) | |
| tree | 7e5252d2696113d411c235d1c5fe8759085ec4ae /tests/openpgp/ssh-import.scm | |
| parent | tests: Remove debugging display. (diff) | |
| download | gnupg-5b5d881f47c82f320abf440c20b7a1bac078a987.tar.gz gnupg-5b5d881f47c82f320abf440c20b7a1bac078a987.zip | |
tests: Rename 'error' to 'fail'.
* tests/gpgscm/tests.scm (error): Rename to 'fail'. 'error' is a
primitive function (an opcode) of the TinySCHEME vm, and 'error' is
also defined by R6RS. Better avoid redefining that. Fix all call
sites.
* tests/openpgp/4gb-packet.scm: Adapt.
* tests/openpgp/decrypt-multifile.scm: Likewise.
* tests/openpgp/ecc.scm: Likewise.
* tests/openpgp/export.scm: Likewise.
* tests/openpgp/gpgtar.scm: Likewise.
* tests/openpgp/gpgv-forged-keyring.scm: Likewise.
* tests/openpgp/import.scm: Likewise.
* tests/openpgp/issue2015.scm: Likewise.
* tests/openpgp/issue2346.scm: Likewise.
* tests/openpgp/issue2419.scm: Likewise.
* tests/openpgp/key-selection.scm: Likewise.
* tests/openpgp/mds.scm: Likewise.
* tests/openpgp/multisig.scm: Likewise.
* tests/openpgp/setup.scm: Likewise.
* tests/openpgp/signencrypt.scm: Likewise.
* tests/openpgp/ssh-import.scm: Likewise.
* tests/openpgp/tofu.scm: Likewise.
* tests/openpgp/verify.scm: Likewise.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'tests/openpgp/ssh-import.scm')
| -rwxr-xr-x | tests/openpgp/ssh-import.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/openpgp/ssh-import.scm b/tests/openpgp/ssh-import.scm index a825409d6..e8f12d36c 100755 --- a/tests/openpgp/ssh-import.scm +++ b/tests/openpgp/ssh-import.scm @@ -22,7 +22,7 @@ (define GNUPGHOME (getenv "GNUPGHOME")) (if (string=? "" GNUPGHOME) - (error "GNUPGHOME not set")) + (fail "GNUPGHOME not set")) (setenv "SSH_AUTH_SOCK" (call-check `(,(tool 'gpgconf) --null --list-dirs agent-ssh-socket)) @@ -51,7 +51,7 @@ (pipe:open file (logior O_RDONLY O_BINARY)) (pipe:spawn `(,SSH-ADD -))) (unless (string-contains? (call-popen `(,SSH-ADD -l "-E" md5) "") hash) - (error "key not added")))) + (fail "key not added")))) car keys) (info "Checking for issue2316...") @@ -64,4 +64,4 @@ (unless (string-contains? (call-popen `(,SSH-ADD -l "-E" md5) "") "c9:85:b5:55:00:84:a9:82:5a:df:d6:62:1b:5a:28:22") - (error "known private key not (re-)added to sshcontrol")) + (fail "known private key not (re-)added to sshcontrol")) |