From: David Bremner <david@tethera.net>
Date: Fri, 29 Jan 2016 11:53:13 +0000 (+2000)
Subject: [PATCH 3/3] test: canonicalize quotes in xapian error messages
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a7a1a8240df655a261be00135e280c5da609a847;p=notmuch-archives.git

[PATCH 3/3] test: canonicalize quotes in xapian error messages
---

diff --git a/4c/d45efeeb4f1e464d2c4d53cbad75f10c3f69f7 b/4c/d45efeeb4f1e464d2c4d53cbad75f10c3f69f7
new file mode 100644
index 000000000..772f10260
--- /dev/null
+++ b/4c/d45efeeb4f1e464d2c4d53cbad75f10c3f69f7
@@ -0,0 +1,73 @@
+Return-Path: <bremner@tethera.net>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+ by arlo.cworth.org (Postfix) with ESMTP id 1DB056DE014A
+ for <notmuch@notmuchmail.org>; Fri, 29 Jan 2016 03:53:37 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at cworth.org
+X-Spam-Flag: NO
+X-Spam-Score: -0.309
+X-Spam-Level: 
+X-Spam-Status: No, score=-0.309 tagged_above=-999 required=5 tests=[AWL=0.242,
+  RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] autolearn=disabled
+Received: from arlo.cworth.org ([127.0.0.1])
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id 87YuxaMbxrwH for <notmuch@notmuchmail.org>;
+ Fri, 29 Jan 2016 03:53:35 -0800 (PST)
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])
+ by arlo.cworth.org (Postfix) with ESMTPS id 6F94A6DE0C11
+ for <notmuch@notmuchmail.org>; Fri, 29 Jan 2016 03:53:35 -0800 (PST)
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)
+ (envelope-from <bremner@tethera.net>)
+ id 1aP7bj-0001vq-66; Fri, 29 Jan 2016 06:52:55 -0500
+Received: (nullmailer pid 5660 invoked by uid 1000);
+ Fri, 29 Jan 2016 11:53:30 -0000
+From: David Bremner <david@tethera.net>
+To: notmuch@notmuchmail.org
+Subject: [PATCH 3/3] test: canonicalize quotes in xapian error messages
+Date: Fri, 29 Jan 2016 07:53:13 -0400
+Message-Id: <1454068393-5406-4-git-send-email-david@tethera.net>
+X-Mailer: git-send-email 2.6.4
+In-Reply-To: <1454068393-5406-1-git-send-email-david@tethera.net>
+References: <1454068393-5406-1-git-send-email-david@tethera.net>
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.20
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+ <notmuch.notmuchmail.org>
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Fri, 29 Jan 2016 11:53:37 -0000
+
+These differ between 1.2 and 1.3, so we transform the 1.2 backquote to a
+single quote for compatibility
+---
+ test/T360-symbol-hiding.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh
+index 4ec0ea6..89e7f16 100755
+--- a/test/T360-symbol-hiding.sh
++++ b/test/T360-symbol-hiding.sh
+@@ -15,11 +15,11 @@ test_begin_subtest 'running test' run_test
+ mkdir -p ${PWD}/fakedb/.notmuch
+ ( LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
+ 		 $TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent \
+-		 2>&1 | sed "s,${PWD},CWD,g") > OUTPUT
++		 2>&1 | notmuch_dir_sanitize | sed "s,\`,\',g") > OUTPUT
+ 
+ cat <<EOF > EXPECTED
+ A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian'
+-caught No chert database found at path \`CWD/nonexistent'
++caught No chert database found at path 'CWD/nonexistent'
+ EOF
+ test_expect_equal_file EXPECTED OUTPUT
+ 
+-- 
+2.6.4
+