unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Pieter Praet <pieter@praet.org>
To: notmuch@notmuchmail.org
Cc: Austin Clements <amdragon@mit.edu>
Subject: [PATCH] test: revert non-intentional changes introduced in eb4cf465
Date: Wed, 29 Jun 2011 22:23:47 +0200	[thread overview]
Message-ID: <1309379027-18048-1-git-send-email-pieter@praet.org> (raw)
In-Reply-To: <87hb78z8xs.fsf@praet.org>

eb4cf465 introduces changes which weren't part of the submitted
patch (id:"87liwlip2j.fsf@gmail.com"), presumably made during
resolving merge conflicts.

The first one causes the title of a test to be printed a second time,
in place of the correct title:

  PASS   Message with .. in Message-Id:
  PASS   Message with .. in Message-Id:

instead of:

  PASS   Message with .. in Message-Id:
  PASS   Sending a message via (fake) SMTP

The second one is simply the insertion of a line break, so no harm there.

This commit reverts both changes, as they were clearly accidental.

Signed-off-by: Pieter Praet <pieter@praet.org>
---
 test/emacs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/test/emacs b/test/emacs
index e59de47..53f455a 100755
--- a/test/emacs
+++ b/test/emacs
@@ -123,13 +123,13 @@ test_emacs '(notmuch-search "id:\"123..456@example\"")
 output=$(notmuch search 'id:"123..456@example"' | notmuch_search_sanitize)
 test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Message with .. in Message-Id (inbox search-add show-add)"
 
+test_begin_subtest "Sending a message via (fake) SMTP"
 emacs_deliver_message \
     'Testing message sent via SMTP' \
     'This is a test that messages are sent via SMTP' \
     '(message-goto-to)
      (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: <XXX>,' < sent_message >OUTPUT
-- 
1.7.4.1

  reply	other threads:[~2011-06-29 20:24 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-27 16:09 [PATCH] test:Improve test behaviors when --root is used Mark Anderson
2011-06-27 20:50 ` Austin Clements
2011-06-27 23:03   ` Mark Anderson
2011-06-28 20:28     ` Carl Worth
2011-06-28 21:25       ` [PATCH v2] " Mark Anderson
2011-06-28 22:11         ` [PATCH v3] " Mark Anderson
2011-06-28 23:03           ` Carl Worth
2011-06-29 20:20             ` Pieter Praet
2011-06-29 20:23               ` Pieter Praet [this message]
2011-06-29 21:23                 ` [PATCH] test: revert non-intentional changes introduced in eb4cf465 Carl Worth
2011-06-28  6:36   ` [PATCH] test:Improve test behaviors when --root is used Pieter Praet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1309379027-18048-1-git-send-email-pieter@praet.org \
    --to=pieter@praet.org \
    --cc=amdragon@mit.edu \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).