diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-04-24 11:32:32 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-04-24 11:34:19 +0200 |
| commit | 9d92e5bca1543be40270c288feb546df0382afee (patch) | |
| tree | 9b0941cf4fd3a6b221397ea5bec6779e2d794d2b /tests | |
| parent | bdc3bacff7e149933275fa4ecbc5644773ca12c5 (diff) | |
Don't prompt for questions when stdin is not a tty.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/setup.sh | 6 | ||||
| -rwxr-xr-x | tests/t0060-rm-tests.sh | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 334b367..779f14a 100644 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -38,10 +38,8 @@ chmod 700 "$GNUPGHOME" GPG="gpg" which gpg2 &>/dev/null && GPG="gpg2" -# We don't want to use any running agent. -# We want an agent to appear to pass to be running. -# We don't need a real agent. Hence: -[[ $GPG == "gpg2" ]] && export GPG_AGENT_INFO=" " || unset GPG_AGENT_INFO +# We don't want any currently running agent to conflict. +unset GPG_AGENT_INFO KEY1="CF90C77B" # pass test key 1 KEY2="D774A374" # pass test key 2 diff --git a/tests/t0060-rm-tests.sh b/tests/t0060-rm-tests.sh index fc38b3d..29fa34a 100755 --- a/tests/t0060-rm-tests.sh +++ b/tests/t0060-rm-tests.sh @@ -7,7 +7,7 @@ cd "$(dirname "$0")" test_expect_success 'Test "rm" command' ' "$PASS" init $KEY1 && "$PASS" generate cred1 43 && - echo "y" | "$PASS" rm cred1 && + "$PASS" rm cred1 && [[ ! -e $PASSWORD_STORE_DIR/cred1.gpg ]] ' |