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

test: clean up some extra whitespace.

Browse source 
The extra space is mainly just untidy.
This commit is contained in:
David Bremner 2021-01-15 21:29:17 -04:00
parent d12d91f828
commit 97fadd0645
16 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/T030-config.sh
View file

@ -76,7 +76,7 @@ test_expect_equal "$(notmuch --config:alt-config config get user.name)" \
"Another Name" "Another Name"
test_begin_subtest "Top level --config<space>FILE option" test_begin_subtest "Top level --config<space>FILE option"
test_expect_equal "$(notmuch --config alt-config config get user.name)" \ test_expect_equal "$(notmuch --config alt-config config get user.name)" \
"Another Name" "Another Name"
test_begin_subtest "Top level --config=FILE option changed the right file" test_begin_subtest "Top level --config=FILE option changed the right file"

8
test/T050-new.sh
View file

@ -341,9 +341,9 @@ notmuch config set new.tags $OLDCONFIG
test_begin_subtest "Xapian exception: read only files" test_begin_subtest "Xapian exception: read only files"
chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.* chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.*
output=$(NOTMUCH_NEW --debug 2>&1 | sed 's/: .*$//' ) output=$(NOTMUCH_NEW --debug 2>&1 | sed 's/: .*$//' )
chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.* chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*
test_expect_equal "$output" "A Xapian exception occurred opening database" test_expect_equal "$output" "A Xapian exception occurred opening database"
@ -385,8 +385,8 @@ test_begin_subtest "reference loop does not crash"
test_expect_code 0 "notmuch show --format=json id:mid-loop-12@example.org id:mid-loop-21@example.org > OUTPUT" test_expect_code 0 "notmuch show --format=json id:mid-loop-12@example.org id:mid-loop-21@example.org > OUTPUT"
test_begin_subtest "reference loop ordered by date" test_begin_subtest "reference loop ordered by date"
threadid=$(notmuch search --output=threads id:mid-loop-12@example.org) threadid=$(notmuch search --output=threads id:mid-loop-12@example.org)
notmuch show --format=mbox $threadid | grep '^Date' > OUTPUT notmuch show --format=mbox $threadid | grep '^Date' > OUTPUT
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
Date: Thu, 16 Jun 2016 22:14:41 -0400 Date: Thu, 16 Jun 2016 22:14:41 -0400
Date: Fri, 17 Jun 2016 22:14:41 -0400 Date: Fri, 17 Jun 2016 22:14:41 -0400

4
test/T070-insert.sh
View file

@ -247,7 +247,7 @@ notmuch config set new.tags $OLDCONFIG
# DUPLICATE_MESSAGE_ID is not tested here, because it should actually pass. # DUPLICATE_MESSAGE_ID is not tested here, because it should actually pass.
# pregenerate all of the test shims # pregenerate all of the test shims
for code in FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR OUT_OF_MEMORY XAPIAN_EXCEPTION; do for code in FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR OUT_OF_MEMORY XAPIAN_EXCEPTION; do
make_shim shim-$code <<EOF make_shim shim-$code <<EOF
#include <notmuch.h> #include <notmuch.h>
#include <stdio.h> #include <stdio.h>
@ -264,7 +264,7 @@ done
gen_insert_msg gen_insert_msg
for code in FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR; do for code in FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR; do
test_begin_subtest "EXIT_FAILURE when index_file returns $code" test_begin_subtest "EXIT_FAILURE when index_file returns $code"
test_expect_code 1 "notmuch_with_shim shim-$code insert < \"$gen_msg_filename\"" test_expect_code 1 "notmuch_with_shim shim-$code insert < \"$gen_msg_filename\""

2
test/T140-excludes.sh
View file

@ -389,7 +389,7 @@ Subject: No messages excluded: single match: reply 4
Subject: No messages excluded: single match: reply 5" Subject: No messages excluded: single match: reply 5"
test_begin_subtest "Show, exclude=false" test_begin_subtest "Show, exclude=false"
output=$(notmuch show --exclude=false tag:test | notmuch_show_sanitize_all | egrep "Subject:|message{") output=$(notmuch show --exclude=false tag:test | notmuch_show_sanitize_all | egrep "Subject:|message{")
test_expect_equal "$output" " message{ id:XXXXX depth:0 match:1 excluded:1 filename:XXXXX test_expect_equal "$output" " message{ id:XXXXX depth:0 match:1 excluded:1 filename:XXXXX
Subject: All messages excluded: single match: reply 2 Subject: All messages excluded: single match: reply 2
message{ id:XXXXX depth:0 match:1 excluded:1 filename:XXXXX message{ id:XXXXX depth:0 match:1 excluded:1 filename:XXXXX

6
test/T150-tagging.sh
View file

@ -90,7 +90,7 @@ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag5 unread)
thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag4 tag5 unread)" thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag4 tag5 unread)"
# generate a common input file for the next several tests. # generate a common input file for the next several tests.
cat > batch.in <<EOF cat > batch.in <<EOF
# %40 is an @ in tag # %40 is an @ in tag
+%40 -tag5 +tag6 -- One +%40 -tag5 +tag6 -- One
+tag1 -tag1 -tag4 +tag4 -- Two +tag1 -tag1 -tag4 +tag4 -- Two
@ -305,9 +305,9 @@ test_begin_subtest "Tag name beginning with -"
test_expect_code 1 'notmuch tag +- One' test_expect_code 1 'notmuch tag +- One'
test_begin_subtest "Xapian exception: read only files" test_begin_subtest "Xapian exception: read only files"
chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.* chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.*
output=$(notmuch tag +something '*' 2>&1 | sed 's/: .*$//' ) output=$(notmuch tag +something '*' 2>&1 | sed 's/: .*$//' )
chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.* chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*
test_expect_equal "$output" "A Xapian exception occurred opening database" test_expect_equal "$output" "A Xapian exception occurred opening database"
test_done test_done

2
test/T210-raw.sh
View file

@ -61,7 +61,7 @@ for pow in {10..20}; do
notmuch show --format=raw subject:$size > OUTPUT notmuch show --format=raw subject:$size > OUTPUT
test_expect_equal_file mail/size-$size OUTPUT test_expect_equal_file mail/size-$size OUTPUT
test_begin_subtest "return value, message of size $size" test_begin_subtest "return value, message of size $size"
test_expect_success "notmuch show --format=raw subject:$size > /dev/null" test_expect_success "notmuch show --format=raw subject:$size > /dev/null"
done done
test_done test_done

20
test/T230-reply-to-sender.sh
View file

@ -43,7 +43,7 @@ add_message '[from]="Sender <sender@example.com>"' \
'[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
'[body]="Multiple recipients"' '[body]="Multiple recipients"'
output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test Subject: Re: notmuch-reply-test
To: Sender <sender@example.com> To: Sender <sender@example.com>
@ -60,7 +60,7 @@ add_message '[from]="Notmuch Test Suite <test_suite@notmuchmail.org>"' \
'[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
'[body]="From Us, Multiple TO recipients"' '[body]="From Us, Multiple TO recipients"'
output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test Subject: Re: notmuch-reply-test
To: Recipient <recipient@example.com>, Someone Else <someone@example.com> To: Recipient <recipient@example.com>, Someone Else <someone@example.com>
@ -78,7 +78,7 @@ add_message '[from]="Sender <sender@example.com>"' \
'[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
'[body]="reply with CC"' '[body]="reply with CC"'
output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test Subject: Re: notmuch-reply-test
To: Sender <sender@example.com> To: Sender <sender@example.com>
@ -96,7 +96,7 @@ add_message '[from]="Notmuch Test Suite <test_suite@notmuchmail.org>"' \
'[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
'[body]="reply with CC"' '[body]="reply with CC"'
output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test Subject: Re: notmuch-reply-test
To: Recipient <recipient@example.com> To: Recipient <recipient@example.com>
@ -113,7 +113,7 @@ add_message '[from]="Notmuch Test Suite <test_suite@notmuchmail.org>"' \
'[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
'[body]="reply with CC"' '[body]="reply with CC"'
output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test Subject: Re: notmuch-reply-test
Cc: Other Parties <cc@example.com> Cc: Other Parties <cc@example.com>
@ -130,7 +130,7 @@ add_message '[from]="Sender <sender@example.com>"' \
'[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
'[body]="reply from alternate address"' '[body]="reply from alternate address"'
output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
Subject: Re: notmuch-reply-test Subject: Re: notmuch-reply-test
To: Sender <sender@example.com> To: Sender <sender@example.com>
@ -148,7 +148,7 @@ add_message '[from]="Sender <sender@example.com>"' \
'[body]="support for reply-to"' \ '[body]="support for reply-to"' \
'[reply-to]="Sender <elsewhere@example.com>"' '[reply-to]="Sender <elsewhere@example.com>"'
output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test Subject: Re: notmuch-reply-test
To: Sender <elsewhere@example.com> To: Sender <elsewhere@example.com>
@ -166,7 +166,7 @@ add_message '[from]="Sender <sender@example.com>"' \
'[body]="support for reply-to with multiple recipients"' \ '[body]="support for reply-to with multiple recipients"' \
'[reply-to]="Sender <elsewhere@example.com>"' '[reply-to]="Sender <elsewhere@example.com>"'
output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test Subject: Re: notmuch-reply-test
To: Sender <elsewhere@example.com> To: Sender <elsewhere@example.com>
@ -184,7 +184,7 @@ add_message '[from]="Sender <sender@example.com>"' \
'[body]="Un-munging Reply-To"' \ '[body]="Un-munging Reply-To"' \
'[reply-to]="Evil Munging List <list@example.com>"' '[reply-to]="Evil Munging List <list@example.com>"'
output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test Subject: Re: notmuch-reply-test
To: Sender <sender@example.com> To: Sender <sender@example.com>
@ -198,7 +198,7 @@ test_begin_subtest "Message with header of exactly 200 bytes"
add_message '[subject]="This subject is exactly 200 bytes in length. Other than its length there is not much of note here. Note that the length of 200 bytes includes the Subject: and Re: prefixes with two spaces"' \ add_message '[subject]="This subject is exactly 200 bytes in length. Other than its length there is not much of note here. Note that the length of 200 bytes includes the Subject: and Re: prefixes with two spaces"' \
'[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
'[body]="200-byte header"' '[body]="200-byte header"'
output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: This subject is exactly 200 bytes in length. Other than its Subject: Re: This subject is exactly 200 bytes in length. Other than its
length there is not much of note here. Note that the length of 200 bytes length there is not much of note here. Note that the length of 200 bytes

4
test/T240-dump-restore.sh
View file

@ -65,7 +65,7 @@ test_begin_subtest "Accumulate with new tags"
test_expect_success \ test_expect_success \
'notmuch restore --input=dump.expected && 'notmuch restore --input=dump.expected &&
notmuch restore --accumulate --input=dump-ABC_DEF.expected && notmuch restore --accumulate --input=dump-ABC_DEF.expected &&
notmuch dump > OUTPUT.$test_count && notmuch dump > OUTPUT.$test_count &&
notmuch restore --input=dump.expected && notmuch restore --input=dump.expected &&
test_cmp dump-ABC_DEF.expected OUTPUT.$test_count' test_cmp dump-ABC_DEF.expected OUTPUT.$test_count'
@ -235,7 +235,7 @@ test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
test_begin_subtest 'format=batch-tag, checking encoded output' test_begin_subtest 'format=batch-tag, checking encoded output'
NOTMUCH_DUMP_TAGS --format=batch-tag -- from:cworth |\ NOTMUCH_DUMP_TAGS --format=batch-tag -- from:cworth |\
awk "{ print \"+$enc1 +$enc2 +$enc3 -- \" \$5 }" > EXPECTED.$test_count awk "{ print \"+$enc1 +$enc2 +$enc3 -- \" \$5 }" > EXPECTED.$test_count
NOTMUCH_DUMP_TAGS --format=batch-tag -- from:cworth > OUTPUT.$test_count NOTMUCH_DUMP_TAGS --format=batch-tag -- from:cworth > OUTPUT.$test_count
test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
test_begin_subtest 'restoring sane tags' test_begin_subtest 'restoring sane tags'

2
test/T340-maildir-sync.sh
View file

@ -174,7 +174,7 @@ thread:XXX 2001-01-05 [1/1(3)] Notmuch Test Suite; Duplicated message (inbox r
test_begin_subtest "Tag changes modify flags of multiple files" test_begin_subtest "Tag changes modify flags of multiple files"
notmuch tag -replied subject:"Duplicated message" notmuch tag -replied subject:"Duplicated message"
(cd $MAIL_DIR/cur/; ls duplicated*) > actual (cd $MAIL_DIR/cur/; ls duplicated*) > actual
test_expect_equal "$(< actual)" "duplicated-message-another-copy:2,S test_expect_equal "$(< actual)" "duplicated-message-another-copy:2,S
duplicated-message-copy:2,S duplicated-message-copy:2,S
duplicated-message:2,S" duplicated-message:2,S"

2
test/T410-argument-parsing.sh
View file

@ -3,7 +3,7 @@ test_description="argument parsing"
. $(dirname "$0")/test-lib.sh || exit 1 . $(dirname "$0")/test-lib.sh || exit 1
test_begin_subtest "sanity check" test_begin_subtest "sanity check"
$TEST_DIRECTORY/arg-test pos1 --keyword=one --boolean --string=foo pos2 --int=7 --flag=one --flag=three > OUTPUT $TEST_DIRECTORY/arg-test pos1 --keyword=one --boolean --string=foo pos2 --int=7 --flag=one --flag=three > OUTPUT
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
boolean 1 boolean 1
keyword 1 keyword 1

8
test/T480-hex-escaping.sh
View file

@ -14,13 +14,13 @@ test_expect_equal "$tag_enc1" "comic_swear=%24%26%5e%25%24%5e%25%5c%5c%2f%2f-+%2
test_begin_subtest "round trip newlines" test_begin_subtest "round trip newlines"
printf 'this\n tag\t has\n spaces\n' > EXPECTED.$test_count printf 'this\n tag\t has\n spaces\n' > EXPECTED.$test_count
$TEST_DIRECTORY/hex-xcode --direction=encode < EXPECTED.$test_count |\ $TEST_DIRECTORY/hex-xcode --direction=encode < EXPECTED.$test_count |\
$TEST_DIRECTORY/hex-xcode --direction=decode > OUTPUT.$test_count $TEST_DIRECTORY/hex-xcode --direction=decode > OUTPUT.$test_count
test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
test_begin_subtest "round trip 8bit chars" test_begin_subtest "round trip 8bit chars"
echo '%c3%91%c3%a5%c3%b0%c3%a3%c3%a5%c3%a9-%c3%8f%c3%8a' > EXPECTED.$test_count echo '%c3%91%c3%a5%c3%b0%c3%a3%c3%a5%c3%a9-%c3%8f%c3%8a' > EXPECTED.$test_count
$TEST_DIRECTORY/hex-xcode --direction=decode < EXPECTED.$test_count |\ $TEST_DIRECTORY/hex-xcode --direction=decode < EXPECTED.$test_count |\
$TEST_DIRECTORY/hex-xcode --direction=encode > OUTPUT.$test_count $TEST_DIRECTORY/hex-xcode --direction=encode > OUTPUT.$test_count
test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
@ -37,13 +37,13 @@ test_expect_equal "$tag_enc1" "comic_swear=%24%26%5e%25%24%5e%25%5c%5c%2f%2f-+%2
test_begin_subtest "round trip newlines (in-place)" test_begin_subtest "round trip newlines (in-place)"
printf 'this\n tag\t has\n spaces\n' > EXPECTED.$test_count printf 'this\n tag\t has\n spaces\n' > EXPECTED.$test_count
$TEST_DIRECTORY/hex-xcode --in-place --direction=encode < EXPECTED.$test_count |\ $TEST_DIRECTORY/hex-xcode --in-place --direction=encode < EXPECTED.$test_count |\
$TEST_DIRECTORY/hex-xcode --in-place --direction=decode > OUTPUT.$test_count $TEST_DIRECTORY/hex-xcode --in-place --direction=decode > OUTPUT.$test_count
test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
test_begin_subtest "round trip 8bit chars (in-place)" test_begin_subtest "round trip 8bit chars (in-place)"
echo '%c3%91%c3%a5%c3%b0%c3%a3%c3%a5%c3%a9-%c3%8f%c3%8a' > EXPECTED.$test_count echo '%c3%91%c3%a5%c3%b0%c3%a3%c3%a5%c3%a9-%c3%8f%c3%8a' > EXPECTED.$test_count
$TEST_DIRECTORY/hex-xcode --in-place --direction=decode < EXPECTED.$test_count |\ $TEST_DIRECTORY/hex-xcode --in-place --direction=decode < EXPECTED.$test_count |\
$TEST_DIRECTORY/hex-xcode --in-place --direction=encode > OUTPUT.$test_count $TEST_DIRECTORY/hex-xcode --in-place --direction=encode > OUTPUT.$test_count
test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count

2
test/T510-thread-replies.sh
View file

@ -178,7 +178,7 @@ test_expect_equal_json "$output" "$expected"
add_email_corpus threading add_email_corpus threading
test_begin_subtest "reply to ghost" test_begin_subtest "reply to ghost"
notmuch show --entire-thread=true id:000-real-root@example.org | grep ^Subject: | head -1 > OUTPUT notmuch show --entire-thread=true id:000-real-root@example.org | grep ^Subject: | head -1 > OUTPUT
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
Subject: root message Subject: root message
EOF EOF

8
test/T562-lib-database.sh
View file

@ -325,7 +325,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
notmuch_tags_t *result; notmuch_tags_t *result;
EXPECT0(notmuch_database_close (db)); EXPECT0(notmuch_database_close (db));
result = notmuch_database_get_all_tags (db); result = notmuch_database_get_all_tags (db);
printf("%d\n", result == NULL); printf("%d\n", result == NULL);
stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION; stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
} }
EOF EOF
@ -343,7 +343,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
char *result; char *result;
EXPECT0(notmuch_database_close (db)); EXPECT0(notmuch_database_close (db));
stat = notmuch_database_get_config (db, "foo", &result); stat = notmuch_database_get_config (db, "foo", &result);
printf("%d\n", stat == NOTMUCH_STATUS_SUCCESS); printf("%d\n", stat == NOTMUCH_STATUS_SUCCESS);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
@ -358,7 +358,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
EXPECT0(notmuch_database_close (db)); EXPECT0(notmuch_database_close (db));
stat = notmuch_database_set_config (db, "foo", "bar"); stat = notmuch_database_set_config (db, "foo", "bar");
printf("%d\n", stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION); printf("%d\n", stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
@ -413,7 +413,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
EXPECT0(notmuch_database_close (db)); EXPECT0(notmuch_database_close (db));
notmuch_decryption_policy_t policy = notmuch_indexopts_get_decrypt_policy (result); notmuch_decryption_policy_t policy = notmuch_indexopts_get_decrypt_policy (result);
stat = notmuch_indexopts_set_decrypt_policy (result, policy); stat = notmuch_indexopts_set_decrypt_policy (result, policy);
printf("%d\n%d\n", policy == NOTMUCH_DECRYPT_AUTO, stat == NOTMUCH_STATUS_SUCCESS); printf("%d\n%d\n", policy == NOTMUCH_DECRYPT_AUTO, stat == NOTMUCH_STATUS_SUCCESS);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED

16
test/T566-lib-message.sh
View file

@ -279,7 +279,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
notmuch_status_t status; notmuch_status_t status;
notmuch_bool_t out; notmuch_bool_t out;
status = notmuch_message_has_maildir_flag_st (message, 'S', &out); status = notmuch_message_has_maildir_flag_st (message, 'S', &out);
printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION); printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
@ -295,7 +295,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
notmuch_status_t status; notmuch_status_t status;
status = notmuch_message_maildir_flags_to_tags (message); status = notmuch_message_maildir_flags_to_tags (message);
printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION); printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
@ -311,7 +311,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
notmuch_status_t status; notmuch_status_t status;
status = notmuch_message_remove_all_tags (message); status = notmuch_message_remove_all_tags (message);
printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION); printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
@ -327,7 +327,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
notmuch_status_t status; notmuch_status_t status;
status = notmuch_message_freeze (message); status = notmuch_message_freeze (message);
printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_SUCCESS); printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_SUCCESS);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
@ -343,7 +343,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
notmuch_status_t status; notmuch_status_t status;
status = notmuch_message_thaw (message); status = notmuch_message_thaw (message);
printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW); printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
@ -358,7 +358,7 @@ test_begin_subtest "Handle destroying message with closed db"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
notmuch_message_destroy (message); notmuch_message_destroy (message);
printf("%d\n%d\n", message != NULL, 1); printf("%d\n%d\n", message != NULL, 1);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
@ -374,7 +374,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
notmuch_database_t *db2; notmuch_database_t *db2;
db2 = notmuch_message_get_database (message); db2 = notmuch_message_get_database (message);
printf("%d\n%d\n", message != NULL, db == db2); printf("%d\n%d\n", message != NULL, db == db2);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
@ -390,7 +390,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
notmuch_status_t status; notmuch_status_t status;
status = notmuch_message_reindex (message, NULL); status = notmuch_message_reindex (message, NULL);
printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION); printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
} }
EOF EOF
cat <<EOF > EXPECTED cat <<EOF > EXPECTED

4
test/T700-reindex.sh
View file

@ -34,11 +34,11 @@ notmuch dump > OUTPUT
test_expect_equal_file initial-dump OUTPUT test_expect_equal_file initial-dump OUTPUT
test_begin_subtest 'reindex preserves tags with special prefixes' test_begin_subtest 'reindex preserves tags with special prefixes'
notmuch tag +attachment2 +encrypted2 +signed2 '*' notmuch tag +attachment2 +encrypted2 +signed2 '*'
notmuch dump > EXPECTED notmuch dump > EXPECTED
notmuch reindex '*' notmuch reindex '*'
notmuch dump > OUTPUT notmuch dump > OUTPUT
notmuch tag -attachment2 -encrypted2 -signed2 '*' notmuch tag -attachment2 -encrypted2 -signed2 '*'
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest 'reindex moves a message between threads' test_begin_subtest 'reindex moves a message between threads'

2
test/T750-gzip.sh
View file

@ -171,7 +171,7 @@ test_expect_equal_file EXPECTED OUTPUT
add_email_corpus lkml add_email_corpus lkml
test_begin_subtest "new doesn't run out of file descriptors with many gzipped files" test_begin_subtest "new doesn't run out of file descriptors with many gzipped files"
ulimit -n 200 ulimit -n 200
find ${MAIL_DIR} -name .notmuch -prune -o -type f -print0 | xargs -0 gzip -- find ${MAIL_DIR} -name .notmuch -prune -o -type f -print0 | xargs -0 gzip --
test_expect_success "notmuch new" test_expect_success "notmuch new"
test_done test_done