--- /dev/null
+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 olra.theworths.org (Postfix) with ESMTP id 184C0431FBD\r
+ for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 16:14:18 -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 Q6dhW3lVmdY6 for <notmuch@notmuchmail.org>;\r
+ Mon, 10 Mar 2014 16:14:14 -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 897C9431FBC\r
+ for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 16:14:14 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1WN9Oa-0004qK-Sp; Mon, 10 Mar 2014 20:14:08 -0300\r
+Received: (nullmailer pid 15999 invoked by uid 1000); Mon, 10 Mar 2014\r
+ 23:14:05 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v4 08/13] test: add database upgrade test from format\r
+ version 1 to 2\r
+In-Reply-To:\r
+ <c7812c1dac1014868d80745305272322d2d25d9a.1394400503.git.jani@nikula.org>\r
+References: <cover.1394400503.git.jani@nikula.org>\r
+ <c7812c1dac1014868d80745305272322d2d25d9a.1394400503.git.jani@nikula.org>\r
+User-Agent: Notmuch/0.17+120~gccab40f (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 10 Mar 2014 20:14:05 -0300\r
+Message-ID: <87siqp7iki.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.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: Mon, 10 Mar 2014 23:14:18 -0000\r
+\r
+Jani Nikula <jani@nikula.org> writes:\r
+\r
+> Test the upgrade from probabilistic to boolean folder: terms, and\r
+> addition of path: terms.\r
+>\r
+> The test depends on the pre-built test corpus and database tarball and\r
+> checksum file being in place. If it's not, the test is skipped. The\r
+> mechanism to fetch the test database will be added later.\r
+>\r
+> At the time of writing, a working test database and checksum file is\r
+> available at\r
+>\r
+> http://notmuchmail.org/releases/test-databases/\r
+>\r
+\r
+Hi Jani;\r
+\r
+This test has gotten out of sync with the corpus in the tree. It still\r
+passes because the database tarball on notmuchmail.org is in the\r
+previous (multi-corpus) style. In particular\r
+\r
+% cd test\r
+% ../devel/gen-testdb.sh -s v1 -v 0.17\r
+% sed -i s/folders-v1/database-v1/ T530-upgrade.sh \r
+% ./T530-upgrade\r
+\r
+yields several failures.\r
+\r
+I think it would be better to update the test to match corpus currently\r
+in the tree.\r
+\r
+d\r