[PATCH] test: kill '"filename": "signature.asc"' from json output

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