From 3dfa9bef24e77ffc8f56adffc0e40e8fdfe9394a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 25 Oct 2014 10:05:34 +0200 Subject: [PATCH] [PATCH] test: kill '"filename": "signature.asc"' from json output --- 5a/6ba982b99f9c8b22d0f83fb47bed7b72187de8 | 69 +++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 5a/6ba982b99f9c8b22d0f83fb47bed7b72187de8 diff --git a/5a/6ba982b99f9c8b22d0f83fb47bed7b72187de8 b/5a/6ba982b99f9c8b22d0f83fb47bed7b72187de8 new file mode 100644 index 000000000..470bced36 --- /dev/null +++ b/5a/6ba982b99f9c8b22d0f83fb47bed7b72187de8 @@ -0,0 +1,69 @@ +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 ACBF3431FC9 + for ; Sat, 25 Oct 2014 01:05:59 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 chBJsy69ZAYG for ; + Sat, 25 Oct 2014 01:05:53 -0700 (PDT) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 57AE5431FBD + for ; Sat, 25 Oct 2014 01:05:53 -0700 (PDT) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1XhwMC-0007YD-Qg; Sat, 25 Oct 2014 05:05:52 -0300 +Received: (nullmailer pid 32549 invoked by uid 1000); Sat, 25 Oct 2014 + 08:05:47 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH] test: kill '"filename": "signature.asc"' from json output +Date: Sat, 25 Oct 2014 10:05:34 +0200 +Message-Id: <1414224334-32497-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.1 +In-Reply-To: <1414223399-13128-1-git-send-email-david@tethera.net> +References: <1414223399-13128-1-git-send-email-david@tethera.net> +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: Sat, 25 Oct 2014 08:05:59 -0000 + +This starts to appear with emacs24.4, so we can't easily have it in +our expected output. +--- + test/test-lib.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/test-lib.sh b/test/test-lib.sh +index 17deaab..72559cc 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -690,6 +690,7 @@ notmuch_json_show_sanitize () + sed \ + -e 's|"id": "[^"]*",|"id": "XXXXX",|g' \ + -e 's|"Date": "Fri, 05 Jan 2001 [^"]*0000"|"Date": "GENERATED_DATE"|g' \ ++ -e 's|"filename": "signature.asc",||g' \ + -e 's|"filename": "/[^"]*",|"filename": "YYYYY",|g' \ + -e 's|"timestamp": 97.......|"timestamp": 42|g' + } +-- +2.1.1 + -- 2.26.2