Re: [PATCH 4/4] test: cope with glass backend file naming variations

diff --git a/bf/340a283b0cfb8aed69f15c8cda084d2276fb8d b/bf/340a283b0cfb8aed69f15c8cda084d2276fb8d
new file mode 100644 (file)
index 0000000..64a9e06
--- /dev/null
+++ b/bf/340a283b0cfb8aed69f15c8cda084d2276fb8d
@@ -0,0 +1,75 @@
+Return-Path: <david@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 972816DE0127\r
+ for <notmuch@notmuchmail.org>; Tue, 12 Apr 2016 16:34:33 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.017\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.017 tagged_above=-999 required=5\r
+ tests=[AWL=-0.006, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id sAA34MyB0rYj for <notmuch@notmuchmail.org>;\r
+ Tue, 12 Apr 2016 16:34:24 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 36CA06DE00F1\r
+ for <notmuch@notmuchmail.org>; Tue, 12 Apr 2016 16:34:24 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1aq7pF-0003BB-2D; Tue, 12 Apr 2016 19:34:29 -0400\r
+Received: (nullmailer pid 19831 invoked by uid 1000);\r
+ Tue, 12 Apr 2016 23:34:18 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 4/4] test: cope with glass backend file naming variations\r
+In-Reply-To: <m2inzmsm0d.fsf@guru.guru-group.fi>\r
+References: <1460166590-6526-1-git-send-email-david@tethera.net>\r
+ <1460166590-6526-5-git-send-email-david@tethera.net>\r
+ <m21t6exzts.fsf@guru.guru-group.fi> <m2inzmsm0d.fsf@guru.guru-group.fi>\r
+User-Agent: Notmuch/0.21+99~gd93d377 (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 12 Apr 2016 20:34:18 -0300\r
+Message-ID: <87shyq5rlx.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 12 Apr 2016 23:34:33 -0000\r
+\r
+Tomi Ollila <tomi.ollila@iki.fi> writes:\r
+\r
+> On Sun, Apr 10 2016, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+>\r
+>> On Sat, Apr 09 2016, David Bremner <david@tethera.net> wrote:\r
+>>\r
+>>> ...\r
+>>\r
+>>> diff --git a/test/T150-tagging.sh b/test/T150-tagging.sh\r
+>>> index 8adcabc..6fd6a18 100755\r
+>>> --- a/test/T150-tagging.sh\r
+>>> +++ b/test/T150-tagging.sh\r
+>>> @@ -287,9 +287,9 @@ test_expect_code 1 "Empty tag names" 'notmuch tag + One'\r
+>>>  test_expect_code 1 "Tag name beginning with -" 'notmuch tag +- One'\r
+>>>  \r
+>>>  test_begin_subtest "Xapian exception: read only files"\r
+>>> -chmod u-w  ${MAIL_DIR}/.notmuch/xapian/*.DB\r
+>>> +chmod u-w  ${MAIL_DIR}/.notmuch/xapian/*.${db_ending}\r
+>>>  output=$(notmuch tag +something '*' 2>&1 | sed 's/: .*$//' )\r
+>>> -chmod u+w  ${MAIL_DIR}/.notmuch/xapian/*.DB\r
+>>> +chmod u+w  ${MAIL_DIR}/.notmuch/xapian/{*.DB,*.glass}\r
+\r
+Pushed with Tomi's fix, and a similar one in T050-new.sh\r