From 5d2b09454135e7e363a98bc098971bd6ed1cba6e Mon Sep 17 00:00:00 2001 From: Pieter Praet Date: Wed, 22 Feb 2012 19:51:12 +0100 Subject: [PATCH] Re: [PATCH v2 2/4] test: emacs: new test "notmuch-search: replying to a thread (sending)" --- 96/1d5fbb31698b5ede93bca7559e85538521878a | 164 ++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 96/1d5fbb31698b5ede93bca7559e85538521878a diff --git a/96/1d5fbb31698b5ede93bca7559e85538521878a b/96/1d5fbb31698b5ede93bca7559e85538521878a new file mode 100644 index 000000000..8c3cc0324 --- /dev/null +++ b/96/1d5fbb31698b5ede93bca7559e85538521878a @@ -0,0 +1,164 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id C082D431FBD + for ; Wed, 22 Feb 2012 10:53:31 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id G4xAsPOVd0N9 for ; + Wed, 22 Feb 2012 10:53:31 -0800 (PST) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id E8E94431FAE + for ; Wed, 22 Feb 2012 10:53:30 -0800 (PST) +Received: by werp13 with SMTP id p13so272659wer.26 + for ; Wed, 22 Feb 2012 10:53:29 -0800 (PST) +Received-SPF: pass (google.com: domain of pieter@praet.org designates + 10.180.101.200 as permitted sender) client-ip=10.180.101.200; +Authentication-Results: mr.google.com; + spf=pass (google.com: domain of pieter@praet.org + designates 10.180.101.200 as permitted sender) + smtp.mail=pieter@praet.org +Received: from mr.google.com ([10.180.101.200]) + by 10.180.101.200 with SMTP id fi8mr37804971wib.20.1329936809975 + (num_hops = 1); Wed, 22 Feb 2012 10:53:29 -0800 (PST) +Received: by 10.180.101.200 with SMTP id fi8mr31281009wib.20.1329936809838; + Wed, 22 Feb 2012 10:53:29 -0800 (PST) +Received: from localhost ([109.131.181.26]) + by mx.google.com with ESMTPS id df3sm18089553wib.1.2012.02.22.10.53.28 + (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 22 Feb 2012 10:53:29 -0800 (PST) +From: Pieter Praet +To: Dmitry Kurochkin , + Notmuch Mail +Subject: Re: [PATCH v2 2/4] test: emacs: new test "notmuch-search: replying to + a thread (sending)" +In-Reply-To: <87fwe5lln3.fsf@gmail.com> +References: <1310313335-4159-1-git-send-email-pieter@praet.org> + <1329683908-5435-1-git-send-email-pieter@praet.org> + <1329683908-5435-3-git-send-email-pieter@praet.org> + <87fwe5lln3.fsf@gmail.com> +User-Agent: Notmuch/0.11.1+210~g6afc43e (http://notmuchmail.org) Emacs/23.3.1 + (x86_64-unknown-linux-gnu) +Date: Wed, 22 Feb 2012 19:51:12 +0100 +Message-ID: <87k43e8zxb.fsf@praet.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Gm-Message-State: + ALoCoQntJAuwx6h0Rj8qD9FW4ISbwsZgxQzxFdceMigz0UcxcbcHR92H3ns1pgom9u0YOWXOnoeK +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 22 Feb 2012 18:53:31 -0000 + +On Mon, 20 Feb 2012 16:44:32 +0400, Dmitry Kurochkin wrote: +> On Sun, 19 Feb 2012 21:38:26 +0100, Pieter Praet 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 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: ,' \ +> > + -e s',^In-Reply-To: <.*>$,In-Reply-To: ,' \ +> > + -e s',^References: <.*>$,References: ,' \ +> > + -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 <EXPECTED +> > +From: Notmuch Test Suite +> > +To: user@example.com +> > +Subject: Re: Testing message sent via SMTP +> > +In-Reply-To: +> > +References: +> > +User-Agent: Notmuch/XXX Emacs/XXX +> > +Date: Fri, 29 Mar 1974 10:05:00 -0000 +> > +Message-ID: +> > +MIME-Version: 1.0 +> > +Content-Type: text/plain; charset=us-ascii +> > + +> > +On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite 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" -- 2.26.2