aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/sexp
diff options
context:
space:
mode:
authorGravatar Peter Wang <novalazy@gmail.com>2012-12-15 14:06:45 +1100
committerGravatar David Bremner <bremner@debian.org>2012-12-17 09:11:57 -0400
commit732f50a20aac461101986fafec95771c8a686ebe (patch)
treed76389985cc47593db367b1ce3fea84c1b43b492 /test/sexp
parentb96ba6326af442edfdad59e5e42ea42892cd3c6b (diff)
test: conform to content length, encoding fields
Update tests to expect content-length and content-transfer-encoding fields in show --format=json output, for leaf parts with omitted body content.
Diffstat (limited to 'test/sexp')
-rwxr-xr-xtest/sexp4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/sexp b/test/sexp
index b8049425..492a82f7 100755
--- a/test/sexp
+++ b/test/sexp
@@ -37,7 +37,9 @@ emacs_deliver_message \
(insert \"Message-ID: <$id>\n\")"
output=$(notmuch show --format=sexp "id:$id")
filename=$(notmuch search --output=files "id:$id")
-test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename \"$filename\" :timestamp 946728000 :date_relative \"2000-01-01\" :tags (\"inbox\") :headers (:Subject \"sexp-show-inline-attachment-filename\" :From \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :To \"test_suite@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\") :body ((:id 1 :content-type \"multipart/mixed\" :content ((:id 2 :content-type \"text/plain\" :content \"This is a test message with inline attachment with a filename\") (:id 3 :content-type \"application/octet-stream\" :filename \"README\"))))) ())))"
+# Get length of README after base64-encoding, minus additional newline.
+attachment_length=$(( $(base64 $TEST_DIRECTORY/README | wc -c) - 1 ))
+test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename \"$filename\" :timestamp 946728000 :date_relative \"2000-01-01\" :tags (\"inbox\") :headers (:Subject \"sexp-show-inline-attachment-filename\" :From \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :To \"test_suite@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\") :body ((:id 1 :content-type \"multipart/mixed\" :content ((:id 2 :content-type \"text/plain\" :content \"This is a test message with inline attachment with a filename\") (:id 3 :content-type \"application/octet-stream\" :filename \"README\" :content-transfer-encoding \"base64\" :content-length $attachment_length))))) ())))"
test_begin_subtest "Search message: sexp, utf-8"
add_message "[subject]=\"sexp-search-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-search-méssage\""