[PATCH 5/5] test: remove some sed(1) calls in Emacs tests

diff --git a/78/80f8ea410631249850b5c9f618a82fd4e76551 b/78/80f8ea410631249850b5c9f618a82fd4e76551
new file mode 100644 (file)
index 0000000..fc995a0
--- /dev/null
+++ b/78/80f8ea410631249850b5c9f618a82fd4e76551
@@ -0,0 +1,106 @@
+Return-Path: <dmitry.kurochkin@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 536CB429E42\r
+       for <notmuch@notmuchmail.org>; Sun, 26 Jun 2011 16:53:32 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id d4y8LdzP36TC for <notmuch@notmuchmail.org>;\r
+       Sun, 26 Jun 2011 16:53:31 -0700 (PDT)\r
+Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id EFAC2429E40\r
+       for <notmuch@notmuchmail.org>; Sun, 26 Jun 2011 16:53:29 -0700 (PDT)\r
+Received: by mail-bw0-f53.google.com with SMTP id 12so3882788bwg.26\r
+       for <notmuch@notmuchmail.org>; Sun, 26 Jun 2011 16:53:29 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer\r
+       :in-reply-to:references;\r
+       bh=SduKmz/fpQML0ZhFHD9J9VUkVlXm5cREmR/lvHzmuXo=;\r
+       b=kxmWehjGuBPrXRBDCpEv/Q7r8udIR7Ram8TCcYn/jDn4aFkCXZGF+mHMHpguSSDo3e\r
+       3k46c1hV4DaGtvZuBW/BeURkQldMY84YPV15koi4kdkuMFRefOitKrgaAGqTK2xX7Z9s\r
+       Pj4KK0f36tmbv17rXtaq50TpuwjRNZlkBDw7Q=\r
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       b=mhbPVUyOxD+LCDa/9igJBCGM+cWrkdfgr9Vq3ziEISIa8kvZTDVMSe2fvee4zd0RRm\r
+       vPw/zgCqFFw4SMSQKPWdClOuTvza8bMphmS5NkdCova6qZsXiJa31qj2D3SSctmMggZx\r
+       76AIV+BgzmSfrPSiHwMmSALGrREDDjvkBSkSQ=\r
+Received: by 10.204.34.70 with SMTP id k6mr1051374bkd.155.1309132408001;\r
+       Sun, 26 Jun 2011 16:53:28 -0700 (PDT)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id c13sm176090bkc.2.2011.06.26.16.53.26\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 26 Jun 2011 16:53:27 -0700 (PDT)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 5/5] test: remove some sed(1) calls in Emacs tests\r
+Date: Mon, 27 Jun 2011 03:52:59 +0400\r
+Message-Id: <1309132379-24089-5-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1309132379-24089-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1309132379-24089-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 26 Jun 2011 23:53:32 -0000\r
+\r
+Few Emacs tests used sed(1) to remove unexpected output in the\r
+beginning to avoid getting confused by messages such as "Parsing\r
+/home/cworth/.mailrc... done".  This is no longer needed since\r
+tests are run in a temporary home directory instead of the user's\r
+one.  So remove these sed(1) calls.\r
+---\r
+ test/emacs |    5 -----\r
+ 1 files changed, 0 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index fc4c01f..f3239ea 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -250,13 +250,10 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Reply within emacs"\r
+-# We sed away everything before the ^From in the output to avoid getting\r
+-# confused by messages such as "Parsing /home/cworth/.mailrc... done"\r
+ test_emacs '(notmuch-search "subject:\"testing message sent via SMTP\"")\r
+           (notmuch-test-wait)\r
+           (notmuch-search-reply-to-thread)\r
+           (test-output)'\r
+-sed -i -ne '/^From/,$ p' OUTPUT\r
+ sed -i -e 's/^In-Reply-To: <.*>$/In-Reply-To: <XXX>/' OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+@@ -284,11 +281,9 @@ test_emacs '(notmuch-show-save-part "id:cf0c4d610911171136h1713aa59w9cf9aa31f052\r
+ test_expect_equal_file "$EXPECTED/attachment" attachment2.gz\r
+ \r
+ test_begin_subtest "View raw message within emacs"\r
+-first_line=$(head -n1 $EXPECTED/raw-message-cf0c4d-52ad0a)\r
+ test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com")\r
+           (notmuch-show-view-raw-message)\r
+           (test-output)'\r
+-sed -i -ne "/$first_line/,\$ p" OUTPUT\r
+ test_expect_equal_file OUTPUT $EXPECTED/raw-message-cf0c4d-52ad0a\r
+ \r
+ test_begin_subtest "Hiding/showing signature in notmuch-show view"\r
+-- \r
+1.7.5.4\r
+\r