X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2FT310-emacs.sh;h=01385ae81f4084de75f7cbcc83b8567d759df2e8;hp=863219d9f9e973395e66a8507eeac6b5e044a9c9;hb=dfacfe14f337b6603ba0784e4a395489923fd6dd;hpb=a755c9d6a9099366cc82ba3a4bee8e6d2b83d529 diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh index 863219d9..01385ae8 100755 --- a/test/T310-emacs.sh +++ b/test/T310-emacs.sh @@ -1,12 +1,16 @@ #!/usr/bin/env bash test_description="emacs interface" -. ./test-lib.sh +. ./test-lib.sh || exit 1 EXPECTED=$TEST_DIRECTORY/emacs.expected-output add_email_corpus +# syntax errors in test-lib.el cause mysterious failures +test_expect_success 'Syntax of emacs test library' \ + "${TEST_EMACS} -Q --batch --load $TEST_DIRECTORY/test-lib.el" + test_begin_subtest "Basic notmuch-hello view in emacs" test_emacs '(notmuch-hello) (test-output)' @@ -126,7 +130,7 @@ test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexande test_begin_subtest "Add tag (large query)" # We use a long query to force us into batch mode and use a funny tag # that requires escaping for batch tagging. -test_emacs "(notmuch-tag (concat \"$os_x_darwin_thread\" \" or \" (make-string notmuch-tag-argument-limit ?x)) (list \"+tag-from-%-large-query\"))" +test_emacs "(notmuch-tag (concat \"$os_x_darwin_thread\" \" or \" (mapconcat #'identity (make-list notmuch-tag-argument-limit \"x\") \"-\")) (list \"+tag-from-%-large-query\"))" output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-%-large-query unread)" notmuch tag -tag-from-%-large-query $os_x_darwin_thread @@ -189,7 +193,6 @@ emacs_deliver_message \ (kill-whole-line) (insert "To: user@example.com\n")' sed \ - -e s',^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' \ -e s',^Message-ID: <.*>$,Message-ID: ,' \ -e s',^\(Content-Type: text/plain\); charset=us-ascii$,\1,' < sent_message >OUTPUT cat <EXPECTED @@ -197,7 +200,6 @@ From: Notmuch Test Suite To: user@example.com Subject: Testing message sent via SMTP Date: 01 Jan 2000 12:00:00 -0000 -User-Agent: Notmuch/XXX Emacs/XXX Message-ID: MIME-Version: 1.0 Content-Type: text/plain @@ -306,7 +308,6 @@ test_emacs '(let ((message-hidden-headers ''())) (test-output))' sed -i -e 's/^In-Reply-To: <.*>$/In-Reply-To: /' OUTPUT sed -i -e 's/^References: <.*>$/References: /' OUTPUT -sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT cat <EXPECTED From: Notmuch Test Suite To: user@example.com @@ -314,7 +315,6 @@ Subject: Re: Testing message sent via SMTP In-Reply-To: Fcc: ${MAIL_DIR}/sent References: -User-Agent: Notmuch/XXX Emacs/XXX --text follows this line-- Notmuch Test Suite writes: @@ -331,7 +331,6 @@ test_emacs "(let ((message-hidden-headers '())) (notmuch-test-wait) (notmuch-search-reply-to-thread) (test-output))" -sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT cat <EXPECTED From: Notmuch Test Suite To: Sender @@ -339,7 +338,6 @@ Subject: Re: ${test_subtest_name} In-Reply-To: <${gen_msg_id}> Fcc: ${MAIL_DIR}/sent References: <${gen_msg_id}> -User-Agent: Notmuch/XXX Emacs/XXX --text follows this line-- Sender writes: @@ -357,7 +355,6 @@ test_emacs "(let ((message-hidden-headers '())) (notmuch-test-wait) (notmuch-search-reply-to-thread) (test-output))" -sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT cat <EXPECTED From: Notmuch Test Suite To: Sender , someone@example.com @@ -365,7 +362,6 @@ Subject: Re: ${test_subtest_name} In-Reply-To: <${gen_msg_id}> Fcc: ${MAIL_DIR}/sent References: <${gen_msg_id}> -User-Agent: Notmuch/XXX Emacs/XXX --text follows this line-- Sender writes: @@ -378,7 +374,6 @@ test_emacs '(let ((message-hidden-headers ''())) (notmuch-show "id:20091118002059.067214ed@hikari") (notmuch-show-reply) (test-output))' -sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT cat <EXPECTED From: Notmuch Test Suite To: Adrian Perez de Castro , notmuch@notmuchmail.org @@ -386,7 +381,6 @@ Subject: Re: [notmuch] Introducing myself In-Reply-To: <20091118002059.067214ed@hikari> Fcc: ${MAIL_DIR}/sent References: <20091118002059.067214ed@hikari> -User-Agent: Notmuch/XXX Emacs/XXX --text follows this line-- Adrian Perez de Castro writes: @@ -441,7 +435,6 @@ test_emacs '(let ((message-hidden-headers ''())) (notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com") (notmuch-show-reply) (test-output))' -sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT cat <EXPECTED From: Notmuch Test Suite To: Alex Botero-Lowry , notmuch@notmuchmail.org @@ -449,7 +442,6 @@ Subject: Re: [notmuch] preliminary FreeBSD support In-Reply-To: Fcc: ${MAIL_DIR}/sent References: -User-Agent: Notmuch/XXX Emacs/XXX --text follows this line-- Alex Botero-Lowry writes: @@ -469,6 +461,38 @@ Alex Botero-Lowry writes: > and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically > uses 64 as the > buffer size. +> From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001 +> From: Alexander Botero-Lowry +> Date: Tue, 17 Nov 2009 11:30:39 -0800 +> Subject: [PATCH] Deal with situation where sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 +> +> --- +> notmuch-config.c | 2 ++ +> 1 files changed, 2 insertions(+), 0 deletions(-) +> +> diff --git a/notmuch-config.c b/notmuch-config.c +> index 248149c..e7220d8 100644 +> --- a/notmuch-config.c +> +++ b/notmuch-config.c +> @@ -77,6 +77,7 @@ static char * +> get_name_from_passwd_file (void *ctx) +> { +> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); +> + if (pw_buf_size == -1) pw_buf_size = 64; +> char *pw_buf = talloc_zero_size (ctx, pw_buf_size); +> struct passwd passwd, *ignored; +> char *name; +> @@ -101,6 +102,7 @@ static char * +> get_username_from_passwd_file (void *ctx) +> { +> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); +> + if (pw_buf_size == -1) pw_buf_size = 64; +> char *pw_buf = talloc_zero_size (ctx, pw_buf_size); +> struct passwd passwd, *ignored; +> char *name; +> -- +> 1.6.5.2 +> > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org @@ -479,11 +503,10 @@ test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "Reply within emacs to an html-only message" add_message '[content-type]="text/html"' \ '[body]="Hi,
This is an HTML test message.

OK?"' -test_emacs "(let ((message-hidden-headers '()) (mm-text-html-renderer 'html2text)) +test_emacs "(let ((message-hidden-headers '())) (notmuch-show \"id:${gen_msg_id}\") (notmuch-show-reply) (test-output))" -sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT cat <EXPECTED From: Notmuch Test Suite To: @@ -491,7 +514,6 @@ Subject: Re: Reply within emacs to an html-only message In-Reply-To: <${gen_msg_id}> Fcc: ${MAIL_DIR}/sent References: <${gen_msg_id}> -User-Agent: Notmuch/XXX Emacs/XXX --text follows this line-- Notmuch Test Suite writes: @@ -499,6 +521,30 @@ Notmuch Test Suite writes: EOF test_expect_equal_file OUTPUT EXPECTED +test_begin_subtest "Reply within emacs to message from self" +test_subtest_known_broken +add_message '[from]="test_suite@notmuchmail.org"' \ + '[to]="test_suite@notmuchmail.org"' +test_emacs "(let ((message-hidden-headers '())) + (notmuch-show \"id:${gen_msg_id}\") + (notmuch-show-reply) + (test-output))" +sed -i -e 's/^In-Reply-To: <.*>$/In-Reply-To: /' OUTPUT +sed -i -e 's/^References: <.*>$/References: /' OUTPUT +cat <EXPECTED +From: Notmuch Test Suite +To: test_suite@notmuchmail.org +Subject: Re: Reply within emacs to message from self +In-Reply-To: +Fcc: ${MAIL_DIR}/sent +References: +--text follows this line-- +test_suite@notmuchmail.org writes: + +> This is just a test message (#7) +EOF +test_expect_equal_file EXPECTED OUTPUT + test_begin_subtest "Quote MML tags in reply" message_id='test-emacs-mml-quoting@message.id' add_message [id]="$message_id" \ @@ -508,7 +554,6 @@ test_emacs "(let ((message-hidden-headers '())) (notmuch-show \"id:$message_id\") (notmuch-show-reply) (test-output))" -sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT cat <EXPECTED From: Notmuch Test Suite To: @@ -516,7 +561,6 @@ Subject: Re: Quote MML tags in reply In-Reply-To: Fcc: ${MAIL_DIR}/sent References: -User-Agent: Notmuch/XXX Emacs/XXX --text follows this line-- Notmuch Test Suite writes: @@ -722,8 +766,8 @@ bought inbox,stashtest ${gen_msg_filename} http://mid.gmane.org/bought -http://marc.info/?i=bought -http://mail-archive.com/search?l=mid&q=bought +https://marc.info/?i=bought +https://mid.mail-archive.com/bought EOF test_expect_equal_file OUTPUT EXPECTED @@ -873,7 +917,8 @@ exit 1 EOF chmod a+x notmuch_fail test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) - (with-current-buffer \"*Messages*\" (erase-buffer)) + (with-current-buffer \"*Messages*\" + (let ((inhibit-read-only t)) (erase-buffer))) (with-current-buffer (get-buffer-create \"*Notmuch errors*\") (erase-buffer)) (notmuch-search \"tag:inbox\") @@ -905,7 +950,8 @@ exit 0 EOF chmod a+x notmuch_fail test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) - (with-current-buffer \"*Messages*\" (erase-buffer)) + (with-current-buffer \"*Messages*\" + (let ((inhibit-read-only t)) (erase-buffer))) (with-current-buffer (get-buffer-create \"*Notmuch errors*\") (erase-buffer)) (notmuch-search \"tag:inbox\") @@ -949,4 +995,15 @@ test_emacs '(notmuch-search "subject:\"search race test\" -subject:two") output=$(notmuch search --output=messages 'tag:search-global-race-tag') test_expect_equal "$output" "id:$gen_msg_id_1" +test_begin_subtest "Term escaping" +output=$(test_emacs "(mapcar 'notmuch-escape-boolean-term (list + \"\" + \"abc\`~\!@#\$%^&*-=_+123\" + \"(abc\" + \")abc\" + \"\\\"abc\" + \"\x01xyz\" + \"\\x201cxyz\\x201d\"))") +test_expect_equal "$output" '("\"\"" "abc`~!@#$%^&*-=_+123" "\"(abc\"" "\")abc\"" "\"\"\"abc\"" "\"'$'\x01''xyz\"" "\"“xyz”\"")' + test_done