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