b9/8bec58f3cf9c1fce0570e0668f5d0037c37331

   1 Return-Path: <jani@nikula.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 1F98E429E30\r
   6         for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:27:12 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: -0.7\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  13         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id wdTN6KjqgfzT for <notmuch@notmuchmail.org>;\r
  17         Sat, 22 Feb 2014 14:27:08 -0800 (PST)\r
  18 Received: from mail-ee0-f47.google.com (mail-ee0-f47.google.com\r
  19  [74.125.83.47])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  20  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  21  6F72F431FBF    for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:14 -0800\r
  22  (PST)\r
  23 Received: by mail-ee0-f47.google.com with SMTP id e49so158791eek.34\r
  24         for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:13 -0800 (PST)\r
  25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  26         d=1e100.net; s=20130820;\r
  27         h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
  28         :references:in-reply-to:references;\r
  29         bh=RTqZ4JeKf7Q/NmP06sFhIKKCipY9NI4kBWX3n1kRlWo=;\r
  30         b=NhfCZogo0Qx7QxbiHayVOzrNmH2vDYqKnEjB765tbw5lMoyvLgK41iEUsvfFR+Q5q6\r
  31         CBcQONmiDiyjg4dVDHjHccY/Rb7lKtqJOCnMOs4FB5XQF1OgsrNv79alpG/Qsr3DGMI/\r
  32         vK/DzQ+SlcEB1qqeuRHu7/u/onmje0FxRsQUIlaR3ARFdoO7A+qcooN1PNgush7JoYIs\r
  33         Es5U21YdNePQjlVvqZDks0WzF/js85+ehUF3u2DDeE7mopEsMTQe/m/TPpLjb+U4i8qG\r
  34         szfhmCFbv/OdK1CdDnM/RvbMML/pB2sSBaN6V/uQbHboxPO64J1cV8X25QSqPb5GaUXF\r
  35         HFmg==\r
  36 X-Gm-Message-State:\r
  37  ALoCoQloHIiR4+3QWel7Ot4UVri0m+eA4MJPxiDrObAFyNHzAvSh/c7Whw8uH2wHcVpdARmQ2tny\r
  38 X-Received: by 10.14.2.193 with SMTP id 41mr16093424eef.55.1393107973261;\r
  39         Sat, 22 Feb 2014 14:26:13 -0800 (PST)\r
  40 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  41         [88.195.111.91])\r
  42         by mx.google.com with ESMTPSA id 43sm41969582eeh.13.2014.02.22.14.26.12\r
  43         for <multiple recipients>\r
  44         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  45         Sat, 22 Feb 2014 14:26:12 -0800 (PST)\r
  46 From: Jani Nikula <jani@nikula.org>\r
  47 To: notmuch@notmuchmail.org\r
  48 Subject: [PATCH v2 11/13] test: add database upgrade test from format version\r
  49         1 to 2\r
  50 Date: Sun, 23 Feb 2014 00:25:42 +0200\r
  51 Message-Id:\r
  52  <a973181bd5877cd2649a63f1720504b798ad01b6.1393105055.git.jani@nikula.org>\r
  53 X-Mailer: git-send-email 1.8.5.3\r
  54 In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
  55 References: <cover.1393105055.git.jani@nikula.org>\r
  56 In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
  57 References: <cover.1393105055.git.jani@nikula.org>\r
  58 X-BeenThere: notmuch@notmuchmail.org\r
  59 X-Mailman-Version: 2.1.13\r
  60 Precedence: list\r
  61 List-Id: "Use and development of the notmuch mail system."\r
  62         <notmuch.notmuchmail.org>\r
  63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  64         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  66 List-Post: <mailto:notmuch@notmuchmail.org>\r
  67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  70 X-List-Received-Date: Sat, 22 Feb 2014 22:27:12 -0000\r
  71 \r
  72 Test the upgrade from probabilistic to boolean folder: terms, and\r
  73 addition of path: terms.\r
  74 ---\r
  75  test/T530-upgrade.sh | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++\r
  76  1 file changed, 103 insertions(+)\r
  77  create mode 100755 test/T530-upgrade.sh\r
  78 \r
  79 diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
  80 new file mode 100755\r
  81 index 000000000000..cf9914e380be\r
  82 --- /dev/null\r
  83 +++ b/test/T530-upgrade.sh\r
  84 @@ -0,0 +1,103 @@\r
  85 +#!/usr/bin/env bash\r
  86 +test_description="database upgrade"\r
  87 +\r
  88 +. ./test-lib.sh\r
  89 +\r
  90 +tar zxf $TEST_DIRECTORY/test-databases/database-v1.tar.gz -C ${MAIL_DIR} --strip-components=1\r
  91 +\r
  92 +test_begin_subtest "folder: search does not work with old database version"\r
  93 +output=$(notmuch search folder:foo)\r
  94 +test_expect_equal "$output" ""\r
  95 +\r
  96 +test_begin_subtest "path: search does not work with old database version"\r
  97 +output=$(notmuch search path:foo)\r
  98 +test_expect_equal "$output" ""\r
  99 +\r
 100 +test_begin_subtest "database upgrade from format version 1"\r
 101 +output=$(notmuch new)\r
 102 +test_expect_equal "$output" "\\r
 103 +Welcome to a new version of notmuch! Your database will now be upgraded.\r
 104 +Your notmuch database has now been upgraded to database format version 2.\r
 105 +No new mail."\r
 106 +\r
 107 +test_begin_subtest "folder: no longer matches in the middle of path"\r
 108 +output=$(notmuch search folder:baz)\r
 109 +test_expect_equal "$output" ""\r
 110 +\r
 111 +test_begin_subtest "folder: search"\r
 112 +output=$(notmuch search --output=files folder:foo | sed -e "s,$MAIL_DIR,MAIL_DIR," | sort)\r
 113 +# bar/baz/05:2, and new/03:2, are duplicates of foo/05:2, and\r
 114 +# foo/new/03:2, respectively\r
 115 +test_expect_equal "$output" "MAIL_DIR/bar/baz/05:2,\r
 116 +MAIL_DIR/foo/05:2,\r
 117 +MAIL_DIR/foo/06:2,\r
 118 +MAIL_DIR/foo/cur/07:2,\r
 119 +MAIL_DIR/foo/cur/08:2,\r
 120 +MAIL_DIR/foo/new/03:2,\r
 121 +MAIL_DIR/foo/new/09:2,\r
 122 +MAIL_DIR/foo/new/10:2,\r
 123 +MAIL_DIR/new/03:2,"\r
 124 +\r
 125 +test_begin_subtest "top level folder: search"\r
 126 +output=$(notmuch search --output=files folder:'""' | sed -e "s,$MAIL_DIR,MAIL_DIR," | sort)\r
 127 +# foo/new/03:2, is a duplicate of new/03:2,\r
 128 +test_expect_equal "$output" "MAIL_DIR/01:2,\r
 129 +MAIL_DIR/02:2,\r
 130 +MAIL_DIR/cur/29:2,\r
 131 +MAIL_DIR/cur/30:2,\r
 132 +MAIL_DIR/cur/31:2,\r
 133 +MAIL_DIR/cur/32:2,\r
 134 +MAIL_DIR/cur/33:2,\r
 135 +MAIL_DIR/cur/34:2,\r
 136 +MAIL_DIR/cur/35:2,\r
 137 +MAIL_DIR/cur/36:2,\r
 138 +MAIL_DIR/cur/37:2,\r
 139 +MAIL_DIR/cur/38:2,\r
 140 +MAIL_DIR/cur/39:2,\r
 141 +MAIL_DIR/cur/40:2,\r
 142 +MAIL_DIR/cur/41:2,\r
 143 +MAIL_DIR/cur/42:2,\r
 144 +MAIL_DIR/cur/43:2,\r
 145 +MAIL_DIR/cur/44:2,\r
 146 +MAIL_DIR/cur/45:2,\r
 147 +MAIL_DIR/cur/46:2,\r
 148 +MAIL_DIR/cur/47:2,\r
 149 +MAIL_DIR/cur/48:2,\r
 150 +MAIL_DIR/cur/49:2,\r
 151 +MAIL_DIR/cur/50:2,\r
 152 +MAIL_DIR/cur/52:2,\r
 153 +MAIL_DIR/cur/53:2,\r
 154 +MAIL_DIR/foo/new/03:2,\r
 155 +MAIL_DIR/new/03:2,\r
 156 +MAIL_DIR/new/04:2,"\r
 157 +\r
 158 +test_begin_subtest "path: search"\r
 159 +output=$(notmuch search --output=files path:"bar" | sed -e "s,$MAIL_DIR,MAIL_DIR," | sort)\r
 160 +# foo/05:2, is a duplicate of bar/baz/05:2,\r
 161 +test_expect_equal "$output" "MAIL_DIR/bar/17:2,\r
 162 +MAIL_DIR/bar/18:2,"\r
 163 +\r
 164 +test_begin_subtest "top level path: search"\r
 165 +output=$(notmuch search --output=files path:'""' | sed -e "s,$MAIL_DIR,MAIL_DIR," | sort)\r
 166 +test_expect_equal "$output" "MAIL_DIR/01:2,\r
 167 +MAIL_DIR/02:2,"\r
 168 +\r
 169 +test_begin_subtest "recursive path: search"\r
 170 +output=$(notmuch search --output=files path:"bar/**" | sed -e "s,$MAIL_DIR,MAIL_DIR," | sort)\r
 171 +# foo/05:2, is a duplicate of bar/baz/05:2,\r
 172 +test_expect_equal "$output" "MAIL_DIR/bar/17:2,\r
 173 +MAIL_DIR/bar/18:2,\r
 174 +MAIL_DIR/bar/baz/05:2,\r
 175 +MAIL_DIR/bar/baz/23:2,\r
 176 +MAIL_DIR/bar/baz/24:2,\r
 177 +MAIL_DIR/bar/baz/cur/25:2,\r
 178 +MAIL_DIR/bar/baz/cur/26:2,\r
 179 +MAIL_DIR/bar/baz/new/27:2,\r
 180 +MAIL_DIR/bar/baz/new/28:2,\r
 181 +MAIL_DIR/bar/cur/19:2,\r
 182 +MAIL_DIR/bar/cur/20:2,\r
 183 +MAIL_DIR/bar/new/21:2,\r
 184 +MAIL_DIR/bar/new/22:2,\r
 185 +MAIL_DIR/foo/05:2,"\r
 186 +\r
 187 +test_done\r
 188 -- \r
 189 1.8.5.3\r
 190 \r