On Mon, 20 Feb 2012 16:44:32 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmail.com> wrote: > On Sun, 19 Feb 2012 21:38:26 +0100, Pieter Praet <pieter@praet.org> wrote: > > As pointed out in the previous commit, the test for replying from > > within Emacs didn't actually submit the reply. This one does. > > --- > > test/emacs | 41 +++++++++++++++++++++++++++++++++++++++++ > > 1 files changed, 41 insertions(+), 0 deletions(-) > > > > diff --git a/test/emacs b/test/emacs > > index 308d749..0f4f42b 100755 > > --- a/test/emacs > > +++ b/test/emacs > > @@ -273,6 +273,47 @@ On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> w > > EOF > > test_expect_equal_file OUTPUT EXPECTED > > > > +test_begin_subtest "notmuch-search: replying to a thread (sending)" > > +$TEST_DIRECTORY/smtp-dummy sent_message & > > +smtp_dummy_pid=$! > > +test_emacs \ > > +'(let ((message-send-mail-function '\''message-smtpmail-send-it) > > + (smtpmail-smtp-server "localhost") > > + (smtpmail-smtp-service "25025")) > > + (notmuch-search "subject:\"testing message sent via SMTP\"") > > + (notmuch-test-wait) > > + (notmuch-search-reply-to-thread) > > + (end-of-buffer) > > + (newline) > > + (insert "Reply to a message via Emacs with fake SMTP") > > + (message-send-and-exit))' >/dev/null 2>&1 > > +wait ${smtp_dummy_pid} > > +notmuch new >/dev/null > > +sed \ > > + -e s',^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' \ > > + -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' \ > > + -e s',^In-Reply-To: <.*>$,In-Reply-To: <XXX>,' \ > > + -e s',^References: <.*>$,References: <XXX>,' \ > > + -e s',^Date: .*$,Date: Fri\, 29 Mar 1974 10:05:00 -0000,' < sent_message >OUTPUT > > This sed command is a (partial) copy past from "Sending a message via > (fake) SMTP" test. [...] Aye, that's the one. > [...] I suggest adding notmuch_sent_message_sanitize > function which would replace common headers with XXX. > > Replace Date with XXX for Date for consistency with other headers, > AFAICT a valid date value is not needed here. > Agreed. Will have another look at it when Tomi's refactoring is done [1,2]. > Regards, > Dmitry > > > +cat <<EOF >EXPECTED > > +From: Notmuch Test Suite <test_suite@notmuchmail.org> > > +To: user@example.com > > +Subject: Re: Testing message sent via SMTP > > +In-Reply-To: <XXX> > > +References: <XXX> > > +User-Agent: Notmuch/XXX Emacs/XXX > > +Date: Fri, 29 Mar 1974 10:05:00 -0000 > > +Message-ID: <XXX> > > +MIME-Version: 1.0 > > +Content-Type: text/plain; charset=us-ascii > > + > > +On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote: > > +> This is a test that messages are sent via SMTP > > + > > +Reply to a message via Emacs with fake SMTP > > +EOF > > +test_expect_equal_file OUTPUT EXPECTED > > + > > test_begin_subtest "Quote MML tags in reply" > > message_id='test-emacs-mml-quoting@message.id' > > add_message [id]="$message_id" \ > > -- > > 1.7.8.1 > > Peace -- Pieter [1] id:"m239a6wn4p.fsf@guru.guru-group.fi" [2] id:"87mx8a900t.fsf@praet.org"