lib: query make exclude handling non-destructive

[notmuch] / test / test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 67be917eb94299c609773ab31a2d798c5b172daa..02634ac1cebc88bb1673c88495f427bca82aef7a 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -230,19 +230,10 @@ test_fixed=0
 test_broken=0
 test_success=0
 
-
-_shutdown_gpg_agent () {
-    if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then
-       gpgconf --kill gpg-agent
-       gpgconf --remove-socketdir
-    fi
-}
-
 _exit_common () {
        code=$?
        trap - EXIT
        set +ex
-       _shutdown_gpg_agent
        rm -rf "$TEST_TMPDIR"
 }
 
@@ -280,6 +271,8 @@ die () {
 GIT_EXIT_OK=
 # Note: TEST_TMPDIR *NOT* exported!
 TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XXXXXX")
+# Put GNUPGHOME in TMPDIR to avoid problems with long paths.
+export GNUPGHOME="${TEST_TMPDIR}/gnupg"
 trap 'trap_exit' EXIT
 trap 'trap_signal' HUP INT TERM
 
@@ -667,7 +660,7 @@ test_expect_equal_json () {
 
 # Sort the top-level list of JSON data from stdin.
 test_sort_json () {
-    PYTHONIOENCODING=utf-8 python -c \
+    PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -c \
         "import sys, json; json.dump(sorted(json.load(sys.stdin)),sys.stdout)"
 }
 
@@ -745,7 +738,7 @@ notmuch_json_show_sanitize ()
        -e 's|"id": "[^"]*",|"id": "XXXXX",|g' \
        -e 's|"Date": "Fri, 05 Jan 2001 [^"]*0000"|"Date": "GENERATED_DATE"|g' \
        -e 's|"filename": "signature.asc",||g' \
-       -e 's|"filename": "/[^"]*",|"filename": "YYYYY",|g' \
+       -e 's|"filename": \["/[^"]*"\],|"filename": \["YYYYY"\],|g' \
        -e 's|"timestamp": 97.......|"timestamp": 42|g' \
         -e 's|"content-length": [1-9][0-9]*|"content-length": "NONZERO"|g'
 }
@@ -1286,11 +1279,6 @@ test_init_ () {
 
 . ./test-lib-common.sh || exit 1
 
-# we need the setting of GNUPGHOME in test-lib-common.sh
-if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then
-    gpgconf --create-socketdir
-fi
-
 emacs_generate_script