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