From 2c5eed16b3b0bff9b6f488d3949ebdb62e8d1c35 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 4 Jan 2017 23:33:15 +0200 Subject: [PATCH 1/1] test: replaced use of python with $NOTMUCH_PYTHON (twice) $NOTMUCH_PYTHON is sourced from sh.config, configured by ./configure and stated to be used as: "Name of python command to use in configure and the test suite." --- test/T260-thread-order.sh | 2 +- test/test-lib.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/T260-thread-order.sh b/test/T260-thread-order.sh index f720c998..89f4d1be 100755 --- a/test/T260-thread-order.sh +++ b/test/T260-thread-order.sh @@ -4,7 +4,7 @@ test_description="threading when messages received out of order" # Generate all single-root four message thread structures. We'll use # this for multiple tests below. -THREADS=$(python ${TEST_DIRECTORY}/gen-threads.py 4) +THREADS=$($NOTMUCH_PYTHON ${TEST_DIRECTORY}/gen-threads.py 4) nthreads=$(wc -l <<< "$THREADS") test_begin_subtest "Messages with one parent get linked in all delivery orders" diff --git a/test/test-lib.sh b/test/test-lib.sh index 67be917e..bb32e97b 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -667,7 +667,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)" } -- 2.43.0