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

test-lib: add notmuch_show_part for "notmuch show --format=text"

Browse source 
Thanks to David Bremner for this improved readability!
This commit is contained in:
Daniel Kahn Gillmor 2018-05-11 02:57:58 -04:00 committed by David Bremner
parent 808cababbb
commit 9d114a8552
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/T357-index-decryption.sh
View file

@ -50,7 +50,7 @@ test_expect_equal \
test_begin_subtest "show the message body of the encrypted message" test_begin_subtest "show the message body of the encrypted message"
notmuch dump wumpus notmuch dump wumpus
output=$(notmuch show wumpus | awk '/^\014part}/{ f=0 }; { if (f) { print $0 } } /^\014part{ ID: 3/{ f=1 }') output=$(notmuch show wumpus | notmuch_show_part 3)
expected='This is a test encrypted message with a wumpus.' expected='This is a test encrypted message with a wumpus.'
if [ $NOTMUCH_HAVE_GMIME_SESSION_KEYS -eq 0 ]; then if [ $NOTMUCH_HAVE_GMIME_SESSION_KEYS -eq 0 ]; then
test_subtest_known_broken test_subtest_known_broken
@ -198,14 +198,14 @@ test_expect_equal \
"$expected" "$expected"
test_begin_subtest "show one of the messages with --decrypt=true" test_begin_subtest "show one of the messages with --decrypt=true"
output=$(notmuch show --decrypt=true thread:0000000000000001 | awk '/^\014part}/{ f=0 }; { if (f) { print $0 } } /^\014part{ ID: 3/{ f=1 }') output=$(notmuch show --decrypt=true thread:0000000000000001 | notmuch_show_part 3)
expected='This is a test encrypted message with a wumpus.' expected='This is a test encrypted message with a wumpus.'
test_expect_equal \ test_expect_equal \
"$output" \ "$output" \
"$expected" "$expected"
test_begin_subtest "Ensure that we cannot show the message with --decrypt=auto" test_begin_subtest "Ensure that we cannot show the message with --decrypt=auto"
output=$(notmuch show thread:0000000000000001 | awk '/^\014part}/{ f=0 }; { if (f) { print $0 } } /^\014part{ ID: 3/{ f=1 }') output=$(notmuch show thread:0000000000000001 | notmuch_show_part 3)
expected='Non-text part: application/octet-stream' expected='Non-text part: application/octet-stream'
test_expect_equal \ test_expect_equal \
"$output" \ "$output" \
@ -256,7 +256,7 @@ test_expect_equal \
"$expected" "$expected"
test_begin_subtest "notmuch show should show cleartext if session key is present" test_begin_subtest "notmuch show should show cleartext if session key is present"
output=$(notmuch show id:simple-encrypted@crypto.notmuchmail.org | awk '/^\014part}/{ f=0 }; { if (f) { print $0 } } /^\014part{ ID: 3/{ f=1 }') output=$(notmuch show id:simple-encrypted@crypto.notmuchmail.org | notmuch_show_part 3)
expected='This is a top sekrit message.' expected='This is a top sekrit message.'
if [ $NOTMUCH_HAVE_GMIME_SESSION_KEYS -eq 0 ]; then if [ $NOTMUCH_HAVE_GMIME_SESSION_KEYS -eq 0 ]; then
test_subtest_known_broken test_subtest_known_broken
@ -266,7 +266,7 @@ test_expect_equal \
"$expected" "$expected"
test_begin_subtest "notmuch show should show nothing if decryption is explicitly disallowed" test_begin_subtest "notmuch show should show nothing if decryption is explicitly disallowed"
output=$(notmuch show --decrypt=false id:simple-encrypted@crypto.notmuchmail.org | awk '/^\014part}/{ f=0 }; { if (f) { print $0 } } /^\014part{ ID: 3/{ f=1 }') output=$(notmuch show --decrypt=false id:simple-encrypted@crypto.notmuchmail.org | notmuch_show_part 3)
expected='Non-text part: application/octet-stream' expected='Non-text part: application/octet-stream'
test_expect_equal \ test_expect_equal \
"$output" \ "$output" \

5
test/test-lib.sh
View file

@ -621,6 +621,11 @@ notmuch_config_sanitize ()
notmuch_dir_sanitize | notmuch_built_with_sanitize notmuch_dir_sanitize | notmuch_built_with_sanitize
} }
notmuch_show_part ()
{
awk '/^\014part}/{ f=0 }; { if (f) { print $0 } } /^\014part{ ID: '"$1"'/{ f=1 }'
}
# End of notmuch helper functions # End of notmuch helper functions
# Use test_set_prereq to tell that a particular prerequisite is available. # Use test_set_prereq to tell that a particular prerequisite is available.