Return-Path: <pieter@praet.org>
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 5094042119A
	for <notmuch@notmuchmail.org>; Wed, 29 Jun 2011 13:24:12 -0700 (PDT)
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 0Lw2nC5eyx87 for <notmuch@notmuchmail.org>;
	Wed, 29 Jun 2011 13:24:11 -0700 (PDT)
Received: from mail-wy0-f181.google.com (mail-wy0-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 B4FC642118E
	for <notmuch@notmuchmail.org>; Wed, 29 Jun 2011 13:24:11 -0700 (PDT)
Received: by wyh22 with SMTP id 22so1239763wyh.26
	for <notmuch@notmuchmail.org>; Wed, 29 Jun 2011 13:24:10 -0700 (PDT)
Received: by 10.227.24.146 with SMTP id v18mr1069511wbb.84.1309379050435;
	Wed, 29 Jun 2011 13:24:10 -0700 (PDT)
Received: from localhost ([109.131.150.167])
	by mx.google.com with ESMTPS id n18sm1147912wbh.40.2011.06.29.13.24.08
	(version=TLSv1/SSLv3 cipher=OTHER);
	Wed, 29 Jun 2011 13:24:09 -0700 (PDT)
From: Pieter Praet <pieter@praet.org>
To: notmuch@notmuchmail.org
Subject: [PATCH] test: revert non-intentional changes introduced in eb4cf465
Date: Wed, 29 Jun 2011 22:23:47 +0200
Message-Id: <1309379027-18048-1-git-send-email-pieter@praet.org>
X-Mailer: git-send-email 1.7.4.1
In-Reply-To: <87hb78z8xs.fsf@praet.org>
References: <87hb78z8xs.fsf@praet.org>
Cc: Austin Clements <amdragon@mit.edu>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jun 2011 20:24:12 -0000

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