--- /dev/null
+Return-Path: <jani@nikula.org>\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 A5560431FBD\r
+ for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 22:43:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 n-A6yV6SKvIW for <notmuch@notmuchmail.org>;\r
+ Mon, 10 Mar 2014 22:42:56 -0700 (PDT)\r
+Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com\r
+ [74.125.83.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ 05DC0431FBC for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 22:42:55 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f42.google.com with SMTP id d17so3517789eek.1\r
+ for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 22:42:53 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=Gu/H19dmCFkJSL0o/SRMpDWMyaqtRCA9YYWJTIV2daw=;\r
+ b=WtooBge0VkGt6eo+Ux93Zf5gHRrFuSG/ADLKFzCbrbqTh9cB3dwLTTPv6yRExgnRDu\r
+ FCwoMPguIaRxG6+G3iAAPksg5iCWhxR0ECsH28fXwGNkz8sByOjjWQpY+tlGhJwB9wGo\r
+ W6tTSxKxLaQtL/lQTrY6c92gSTNys/TBKjPyQwCjObQTo6XIJfjtlImzmiWjySqRsOSy\r
+ a18aMGhPZZEaCM7vWGs5z8AWLpS6772jKKXshUz7buJfIEjbkMo9j0nBUIv34btBCYFn\r
+ bYxUtnANkloPjLYYLVkLY4sYP/rf1eDnhlpGBFZ9qKwqCHLGPpWWbO2n37Fxi+jvEDOR\r
+ xNnA==\r
+X-Gm-Message-State:\r
+ ALoCoQlnxSmrf2oktcYHGzT+m6pGBLjn281CF1vfNSsGu5OXr5qt4jqKgSivQAdRo2D+ifV1TR+I\r
+X-Received: by 10.14.204.9 with SMTP id g9mr1515106eeo.82.1394516571971;\r
+ Mon, 10 Mar 2014 22:42:51 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91]) by mx.google.com with ESMTPSA id\r
+ o43sm53367923eef.12.2014.03.10.22.42.50 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Mon, 10 Mar 2014 22:42:51 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5] test: add database upgrade test from format version 1 to 2\r
+Date: Tue, 11 Mar 2014 07:42:49 +0200\r
+Message-Id: <1394516569-24036-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.9.0\r
+In-Reply-To: <87siqp7iki.fsf@zancas.localnet>\r
+References: <87siqp7iki.fsf@zancas.localnet>\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: Tue, 11 Mar 2014 05:43:00 -0000\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
+It has been noted that some non-GNU environments make lack\r
+sha256sum. We leave this portability issue for a followup patch.\r
+\r
+---\r
+\r
+v5 of this patch, sneakily after Austin's "v5 LGTM" mail. ;)\r
+\r
+Fixed test to work with a database generated from the current\r
+corpus. The rearrangement in patch 01 is slightly different from the\r
+folders corpus in the earlier versions of the series (one more file,\r
+two fewer dupes).\r
+\r
+David, please generate a database, verify it passes the test for you\r
+too, and upload to notmuchmail.org. Thanks.\r
+---\r
+ test/T530-upgrade.sh | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 1 file changed, 111 insertions(+)\r
+ create mode 100755 test/T530-upgrade.sh\r
+\r
+diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
+new file mode 100755\r
+index 000000000000..02d40f13b8ac\r
+--- /dev/null\r
++++ b/test/T530-upgrade.sh\r
+@@ -0,0 +1,111 @@\r
++#!/usr/bin/env bash\r
++test_description="database upgrade"\r
++\r
++. ./test-lib.sh\r
++\r
++dbtarball=folders-v1.tar.xz\r
++\r
++# XXX: Accomplish the same with test lib helpers\r
++if [ ! -e ${TEST_DIRECTORY}/test-databases/${dbtarball} ]; then\r
++ test_subtest_missing_external_prereq_["${dbtarball}"]=t\r
++fi\r
++\r
++test_expect_success \\r
++ 'database checksum' \\r
++ '( cd $TEST_DIRECTORY/test-databases &&\r
++ sha256sum --quiet --check --status ${dbtarball}.sha256 )'\r
++\r
++tar xf $TEST_DIRECTORY/test-databases/${dbtarball} -C ${MAIL_DIR} --strip-components=1\r
++\r
++test_begin_subtest "folder: search does not work with old database version"\r
++output=$(notmuch search folder:foo)\r
++test_expect_equal "$output" ""\r
++\r
++test_begin_subtest "path: search does not work with old database version"\r
++output=$(notmuch search path:foo)\r
++test_expect_equal "$output" ""\r
++\r
++test_begin_subtest "database upgrade from format version 1"\r
++output=$(notmuch new)\r
++test_expect_equal "$output" "\\r
++Welcome to a new version of notmuch! Your database will now be upgraded.\r
++Your notmuch database has now been upgraded to database format version 2.\r
++No new mail."\r
++\r
++test_begin_subtest "folder: no longer matches in the middle of path"\r
++output=$(notmuch search folder:baz)\r
++test_expect_equal "$output" ""\r
++\r
++test_begin_subtest "folder: search"\r
++output=$(notmuch search --output=files folder:foo | notmuch_search_files_sanitize | sort)\r
++test_expect_equal "$output" "MAIL_DIR/foo/06:2,\r
++MAIL_DIR/foo/cur/07:2,\r
++MAIL_DIR/foo/cur/08:2,\r
++MAIL_DIR/foo/new/03:2,\r
++MAIL_DIR/foo/new/09:2,\r
++MAIL_DIR/foo/new/10:2,"\r
++\r
++test_begin_subtest "top level folder: search"\r
++output=$(notmuch search --output=files folder:'""' | notmuch_search_files_sanitize | sort)\r
++# bar/18:2, is a duplicate of cur/51:2,\r
++test_expect_equal "$output" "MAIL_DIR/01:2,\r
++MAIL_DIR/02:2,\r
++MAIL_DIR/bar/18:2,\r
++MAIL_DIR/cur/29:2,\r
++MAIL_DIR/cur/30:2,\r
++MAIL_DIR/cur/31:2,\r
++MAIL_DIR/cur/32:2,\r
++MAIL_DIR/cur/33:2,\r
++MAIL_DIR/cur/34:2,\r
++MAIL_DIR/cur/35:2,\r
++MAIL_DIR/cur/36:2,\r
++MAIL_DIR/cur/37:2,\r
++MAIL_DIR/cur/38:2,\r
++MAIL_DIR/cur/39:2,\r
++MAIL_DIR/cur/40:2,\r
++MAIL_DIR/cur/41:2,\r
++MAIL_DIR/cur/42:2,\r
++MAIL_DIR/cur/43:2,\r
++MAIL_DIR/cur/44:2,\r
++MAIL_DIR/cur/45:2,\r
++MAIL_DIR/cur/46:2,\r
++MAIL_DIR/cur/47:2,\r
++MAIL_DIR/cur/48:2,\r
++MAIL_DIR/cur/49:2,\r
++MAIL_DIR/cur/50:2,\r
++MAIL_DIR/cur/51:2,\r
++MAIL_DIR/cur/52:2,\r
++MAIL_DIR/cur/53:2,\r
++MAIL_DIR/new/04:2,"\r
++\r
++test_begin_subtest "path: search"\r
++output=$(notmuch search --output=files path:"bar" | notmuch_search_files_sanitize | sort)\r
++# cur/51:2, is a duplicate of bar/18:2,\r
++test_expect_equal "$output" "MAIL_DIR/bar/17:2,\r
++MAIL_DIR/bar/18:2,\r
++MAIL_DIR/cur/51:2,"\r
++\r
++test_begin_subtest "top level path: search"\r
++output=$(notmuch search --output=files path:'""' | notmuch_search_files_sanitize | sort)\r
++test_expect_equal "$output" "MAIL_DIR/01:2,\r
++MAIL_DIR/02:2,"\r
++\r
++test_begin_subtest "recursive path: search"\r
++output=$(notmuch search --output=files path:"bar/**" | notmuch_search_files_sanitize | sort)\r
++# cur/51:2, is a duplicate of bar/18:2,\r
++test_expect_equal "$output" "MAIL_DIR/bar/17:2,\r
++MAIL_DIR/bar/18:2,\r
++MAIL_DIR/bar/baz/05:2,\r
++MAIL_DIR/bar/baz/23:2,\r
++MAIL_DIR/bar/baz/24:2,\r
++MAIL_DIR/bar/baz/cur/25:2,\r
++MAIL_DIR/bar/baz/cur/26:2,\r
++MAIL_DIR/bar/baz/new/27:2,\r
++MAIL_DIR/bar/baz/new/28:2,\r
++MAIL_DIR/bar/cur/19:2,\r
++MAIL_DIR/bar/cur/20:2,\r
++MAIL_DIR/bar/new/21:2,\r
++MAIL_DIR/bar/new/22:2,\r
++MAIL_DIR/cur/51:2,"\r
++\r
++test_done\r
+-- \r
+1.9.0\r
+\r
projects / notmuch-archives.git / commitdiff