debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: trivial style cleanups

Browse source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras 2021-05-15 15:47:39 -05:00 committed by David Bremner
parent 5f49e3421f
commit 645bea13cb
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/T000-basic.sh
View file

@ -33,7 +33,7 @@ test_begin_subtest 'failure to clean up causes the test to fail'
test_expect_code 2 'test_when_finished "(exit 2)"' test_expect_code 2 'test_when_finished "(exit 2)"'
EXPECTED=$NOTMUCH_SRCDIR/test/test.expected-output EXPECTED=$NOTMUCH_SRCDIR/test/test.expected-output
suppress_diff_date() { suppress_diff_date () {
sed -e 's/\(.*\-\-\- test-verbose\.4\.\expected\).*/\1/' \ sed -e 's/\(.*\-\-\- test-verbose\.4\.\expected\).*/\1/' \
-e 's/\(.*\+\+\+ test-verbose\.4\.\output\).*/\1/' -e 's/\(.*\+\+\+ test-verbose\.4\.\output\).*/\1/'
} }

2
test/T070-insert.sh
View file

@ -15,7 +15,7 @@ notmuch new > /dev/null
# They happen to be in the mail directory already but that is okay # They happen to be in the mail directory already but that is okay
# since we do not call notmuch new hereafter. # since we do not call notmuch new hereafter.
gen_insert_msg() { gen_insert_msg () {
generate_message \ generate_message \
"[subject]=\"insert-subject\"" \ "[subject]=\"insert-subject\"" \
"[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" \ "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" \

10
test/T590-thread-breakage.sh
View file

@ -21,7 +21,7 @@ test_description='thread breakage during reindexing'
. $(dirname "$0")/test-lib.sh || exit 1 . $(dirname "$0")/test-lib.sh || exit 1
message_a() { message_a () {
mkdir -p ${MAIL_DIR}/cur mkdir -p ${MAIL_DIR}/cur
cat > ${MAIL_DIR}/cur/a <<EOF cat > ${MAIL_DIR}/cur/a <<EOF
Subject: First message Subject: First message
@ -35,7 +35,7 @@ Apple
EOF EOF
} }
message_b() { message_b () {
mkdir -p ${MAIL_DIR}/cur mkdir -p ${MAIL_DIR}/cur
cat > ${MAIL_DIR}/cur/b <<EOF cat > ${MAIL_DIR}/cur/b <<EOF
Subject: Second message Subject: Second message
@ -52,19 +52,19 @@ EOF
} }
test_content_count() { test_content_count () {
test_begin_subtest "${3:-looking for $2 instance of '$1'}" test_begin_subtest "${3:-looking for $2 instance of '$1'}"
count=$(notmuch count --output=threads "$1") count=$(notmuch count --output=threads "$1")
test_expect_equal "$count" "$2" test_expect_equal "$count" "$2"
} }
test_thread_count() { test_thread_count () {
test_begin_subtest "${2:-Expecting $1 thread(s)}" test_begin_subtest "${2:-Expecting $1 thread(s)}"
count=$(notmuch count --output=threads) count=$(notmuch count --output=threads)
test_expect_equal "$count" "$1" test_expect_equal "$count" "$1"
} }
test_ghost_count() { test_ghost_count () {
test_begin_subtest "${2:-Expecting $1 ghosts(s)}" test_begin_subtest "${2:-Expecting $1 ghosts(s)}"
ghosts=$($NOTMUCH_BUILDDIR/test/ghost-report ${MAIL_DIR}/.notmuch/xapian) ghosts=$($NOTMUCH_BUILDDIR/test/ghost-report ${MAIL_DIR}/.notmuch/xapian)
test_expect_equal "$ghosts" "$1" test_expect_equal "$ghosts" "$1"

2
test/export-dirs.sh
View file

@ -9,7 +9,7 @@ if [[ -z "${NOTMUCH_SRCDIR}" ]]; then
export NOTMUCH_SRCDIR="$(cd "$(dirname "$0")"/.. && pwd)" export NOTMUCH_SRCDIR="$(cd "$(dirname "$0")"/.. && pwd)"
fi fi
find_builddir() find_builddir ()
{ {
local dir="$1" local dir="$1"

6
test/test-lib.sh
View file

@ -710,7 +710,7 @@ notmuch_built_with_sanitize ()
sed 's/^built_with[.]\(.*\)=.*$/built_with.\1=something/' sed 's/^built_with[.]\(.*\)=.*$/built_with.\1=something/'
} }
notmuch_passwd_sanitize() notmuch_passwd_sanitize ()
{ {
${NOTMUCH_PYTHON} -c' ${NOTMUCH_PYTHON} -c'
import os, sys, pwd, socket import os, sys, pwd, socket
@ -992,7 +992,7 @@ test_must_fail () {
# - cmp's output is not nearly as easy to read as diff -u # - cmp's output is not nearly as easy to read as diff -u
# - not all diff versions understand "-u" # - not all diff versions understand "-u"
test_cmp() { test_cmp () {
$GIT_TEST_CMP "$@" $GIT_TEST_CMP "$@"
} }
@ -1117,7 +1117,7 @@ test_emacs () {
${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $*)" ${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $*)"
} }
test_python() { test_python () {
# Note: if there is need to print debug information from python program, # Note: if there is need to print debug information from python program,
# use stdout = os.fdopen(6, 'w') or stderr = os.fdopen(7, 'w') # use stdout = os.fdopen(6, 'w') or stderr = os.fdopen(7, 'w')
PYTHONPATH="$NOTMUCH_SRCDIR/bindings/python${PYTHONPATH:+:$PYTHONPATH}" \ PYTHONPATH="$NOTMUCH_SRCDIR/bindings/python${PYTHONPATH:+:$PYTHONPATH}" \