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 C9779429E21
	for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 03:39:23 -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 CHllZ0XFE6Uz for <notmuch@notmuchmail.org>;
	Wed, 16 Nov 2011 03:39:23 -0800 (PST)
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 1408D431FB6
	for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 03:39:22 -0800 (PST)
Received: by wyg19 with SMTP id 19so378729wyg.26
	for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 03:39:21 -0800 (PST)
Received: by 10.216.138.221 with SMTP id a71mr5048002wej.102.1321443561546;
	Wed, 16 Nov 2011 03:39:21 -0800 (PST)
Received: from localhost ([109.131.148.49])
	by mx.google.com with ESMTPS id b5sm32460209wbh.4.2011.11.16.03.39.20
	(version=TLSv1/SSLv3 cipher=OTHER);
	Wed, 16 Nov 2011 03:39:21 -0800 (PST)
From: Pieter Praet <pieter@praet.org>
To: David Bremner <david@tethera.net>
Subject: [PATCH] test: emacs: tidy up "Stashing in notmuch-show" test
Date: Wed, 16 Nov 2011 12:38:19 +0100
Message-Id: <1321443499-10220-1-git-send-email-pieter@praet.org>
X-Mailer: git-send-email 1.7.7.1
In-Reply-To: <87obwg6d0r.fsf@zancas.localnet>
References: <87obwg6d0r.fsf@zancas.localnet>
Cc: Notmuch Mail <notmuch@notmuchmail.org>
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, 16 Nov 2011 11:39:23 -0000

Merge expected output into the actual test, so we can verify the stashed
filename using ${gen_msg_filename} instead of doing sed tricks.
---

Thanks David!

Here's a small update that was hanging out on one of my local branches.


Peace

 test/emacs                                |   14 ++++++++++++--
 test/emacs.expected-output/emacs-stashing |    9 ---------
 2 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 test/emacs.expected-output/emacs-stashing

diff --git a/test/emacs b/test/emacs
index 75a0a74..3bf2e29 100755
--- a/test/emacs
+++ b/test/emacs
@@ -369,8 +369,18 @@ test_emacs '(notmuch-show "id:\"bought\"")
           (rotate-yank-pointer 1))
         (reverse-region (point-min) (point-max))
 	    (test-output)'
-sed -i -e 's/^.*tmp.emacs\/mail.*$/FILENAME/' OUTPUT
-test_expect_equal_file OUTPUT $EXPECTED/emacs-stashing
+cat <<EOF >EXPECTED
+Sat, 01 Jan 2000 12:00:00 -0000
+Some One <someone@somewhere.org>
+Some One Else <notsomeone@somewhere.org>
+Notmuch <notmuch@notmuchmail.org>
+Stash my stashables
+id:"bought"
+bought
+inbox,stashtest
+${gen_msg_filename}
+EOF
+test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "Stashing in notmuch-search"
 test_emacs '(notmuch-search "id:\"bought\"")
diff --git a/test/emacs.expected-output/emacs-stashing b/test/emacs.expected-output/emacs-stashing
deleted file mode 100644
index 4923594..0000000
--- a/test/emacs.expected-output/emacs-stashing
+++ /dev/null
@@ -1,9 +0,0 @@
-Sat, 01 Jan 2000 12:00:00 -0000
-Some One <someone@somewhere.org>
-Some One Else <notsomeone@somewhere.org>
-Notmuch <notmuch@notmuchmail.org>
-Stash my stashables
-id:"bought"
-bought
-inbox,stashtest
-FILENAME
-- 
1.7.7.1