diff options
author | David Kalnischkies <david@kalnischkies.de> | 2017-06-04 13:47:51 +0200 |
---|---|---|
committer | David Kalnischkies <david@kalnischkies.de> | 2017-06-26 23:31:15 +0200 |
commit | fe8c10a39ebc5c42c764516985f000ed8d998c82 (patch) | |
tree | cddf4581b62d0b2512b60374de3e9ac591ff6be6 /test/integration/framework | |
parent | 5318af3002654ce881fbbc0f69a3e0a70f3984f1 (diff) |
tests: fix gpg-agent killing in testcases
We want to kill the agent if its home directory exists at that location,
not if it isn't there (leaving an army of processes around).
Gbp-Dch: Ignore
Diffstat (limited to 'test/integration/framework')
-rw-r--r-- | test/integration/framework | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework index c65ac5acb..7fc69e1c5 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1161,7 +1161,7 @@ setupaptarchive() { killgpgagent() { if [ -z "${TMPWORKINGDIRECTORY}" ]; then return; fi local GPGHOME="${TMPWORKINGDIRECTORY}/signinghome" - if [ -e "${GPGHOME}" ]; then return; fi + if [ ! -e "${GPGHOME}" ]; then return; fi # ensure the agent dies quickly as different versions have different suicide heuristics GNUPGHOME="${GPGHOME}" gpgconf --kill gpg-agent >/dev/null 2>&1 || true rm -rf "$GPGHOME" |