8b/ec03c1aa40ca909ab4110f124289f358d9812b

   1 Return-Path: <david@tethera.net>\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 0EF45431FDF\r
   6         for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:10:52 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
  12         autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id en4FYipgPrcJ for <notmuch@notmuchmail.org>;\r
  16         Tue, 11 Mar 2014 16:10:48 -0700 (PDT)\r
  17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
  18         (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id 9A7B2429E29\r
  21         for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:10:48 -0700 (PDT)\r
  22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
  23         (envelope-from <david@tethera.net>)\r
  24         id 1WNVou-00021R-6j; Tue, 11 Mar 2014 20:10:48 -0300\r
  25 Received: (nullmailer pid 923 invoked by uid 1000); Tue, 11 Mar 2014 23:10:44\r
  26         -0000\r
  27 From: David Bremner <david@tethera.net>\r
  28 To: notmuch@notmuchmail.org\r
  29 Subject: Re: v6 of boolean folder patches\r
  30 In-Reply-To: <1394578900-25618-1-git-send-email-david@tethera.net>\r
  31 References: <1394578900-25618-1-git-send-email-david@tethera.net>\r
  32 User-Agent: Notmuch/0.17+120~gccab40f (http://notmuchmail.org) Emacs/24.3.1\r
  33         (x86_64-pc-linux-gnu)\r
  34 Date: Tue, 11 Mar 2014 20:10:44 -0300\r
  35 Message-ID: <87ha7472mj.fsf@zancas.localnet>\r
  36 MIME-Version: 1.0\r
  37 Content-Type: text/plain\r
  38 X-BeenThere: notmuch@notmuchmail.org\r
  39 X-Mailman-Version: 2.1.13\r
  40 Precedence: list\r
  41 List-Id: "Use and development of the notmuch mail system."\r
  42         <notmuch.notmuchmail.org>\r
  43 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  44         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  45 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  46 List-Post: <mailto:notmuch@notmuchmail.org>\r
  47 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  48 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  49         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  50 X-List-Received-Date: Tue, 11 Mar 2014 23:10:52 -0000\r
  51 \r
  52 David Bremner <david@tethera.net> writes:\r
  53 \r
  54 >\r
  55 > Here's a diffstat\r
  56 >\r
  57 >  test/T090-search-output.sh                    | 112 +++++++++++++-------------\r
  58 >  test/T530-upgrade.sh                          |  26 +++---\r
  59 >  test/test-databases/Makefile.local            |   2 +-\r
  60 >  test/test-databases/database-v1.tar.xz.sha256 |   1 +\r
  61 >  test/test-databases/folders-v1.tar.xz.sha256  |   1 -\r
  62 >  test/test-lib.sh                              |   6 ++\r
  63 >  6 files changed, 77 insertions(+), 71 deletions(-)\r
  64 \r
  65 by request, a real diff\r
  66 \r
  67 diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh\r
  68 index e0bf8c1..947d572 100755\r
  69 --- a/test/T090-search-output.sh\r
  70 +++ b/test/T090-search-output.sh\r
  71 @@ -181,67 +181,71 @@ EOF\r
  72  test_expect_equal_file OUTPUT EXPECTED\r
  73  \r
  74  test_begin_subtest "--output=files"\r
  75 -notmuch search --output=files '*' | notmuch_search_files_sanitize >OUTPUT\r
  76 +notmuch search --output=files '*' | notmuch_search_files_sanitize | sort >OUTPUT\r
  77  cat <<EOF >EXPECTED\r
  78 -MAIL_DIR/cur/52:2,\r
  79 -MAIL_DIR/cur/53:2,\r
  80 -MAIL_DIR/cur/50:2,\r
  81 -MAIL_DIR/cur/49:2,\r
  82 -MAIL_DIR/cur/48:2,\r
  83 -MAIL_DIR/cur/47:2,\r
  84 -MAIL_DIR/cur/46:2,\r
  85 -MAIL_DIR/cur/45:2,\r
  86 -MAIL_DIR/cur/44:2,\r
  87 -MAIL_DIR/cur/43:2,\r
  88 -MAIL_DIR/cur/42:2,\r
  89 -MAIL_DIR/cur/41:2,\r
  90 -MAIL_DIR/cur/40:2,\r
  91 -MAIL_DIR/cur/39:2,\r
  92 -MAIL_DIR/cur/38:2,\r
  93 -MAIL_DIR/cur/37:2,\r
  94 -MAIL_DIR/cur/36:2,\r
  95 -MAIL_DIR/cur/35:2,\r
  96 -MAIL_DIR/cur/34:2,\r
  97 -MAIL_DIR/cur/33:2,\r
  98 -MAIL_DIR/cur/32:2,\r
  99 -MAIL_DIR/cur/31:2,\r
 100 -MAIL_DIR/cur/30:2,\r
 101 -MAIL_DIR/cur/29:2,\r
 102 -MAIL_DIR/bar/baz/new/28:2,\r
 103 -MAIL_DIR/bar/baz/new/27:2,\r
 104 -MAIL_DIR/bar/baz/cur/26:2,\r
 105 -MAIL_DIR/bar/baz/cur/25:2,\r
 106 -MAIL_DIR/bar/baz/24:2,\r
 107 +MAIL_DIR/01:2,\r
 108 +MAIL_DIR/02:2,\r
 109 +MAIL_DIR/bar/17:2,\r
 110 +MAIL_DIR/bar/18:2,\r
 111 +MAIL_DIR/bar/baz/05:2,\r
 112  MAIL_DIR/bar/baz/23:2,\r
 113 -MAIL_DIR/bar/new/22:2,\r
 114 -MAIL_DIR/bar/new/21:2,\r
 115 +MAIL_DIR/bar/baz/24:2,\r
 116 +MAIL_DIR/bar/baz/cur/25:2,\r
 117 +MAIL_DIR/bar/baz/cur/26:2,\r
 118 +MAIL_DIR/bar/baz/new/27:2,\r
 119 +MAIL_DIR/bar/baz/new/28:2,\r
 120  MAIL_DIR/bar/cur/19:2,\r
 121 -MAIL_DIR/bar/18:2,\r
 122 -MAIL_DIR/cur/51:2,\r
 123  MAIL_DIR/bar/cur/20:2,\r
 124 -MAIL_DIR/bar/17:2,\r
 125 -MAIL_DIR/foo/baz/new/16:2,\r
 126 -MAIL_DIR/foo/baz/new/15:2,\r
 127 -MAIL_DIR/foo/baz/cur/14:2,\r
 128 -MAIL_DIR/foo/baz/cur/13:2,\r
 129 -MAIL_DIR/foo/baz/12:2,\r
 130 +MAIL_DIR/bar/new/21:2,\r
 131 +MAIL_DIR/bar/new/22:2,\r
 132 +MAIL_DIR/cur/29:2,\r
 133 +MAIL_DIR/cur/30:2,\r
 134 +MAIL_DIR/cur/31:2,\r
 135 +MAIL_DIR/cur/32:2,\r
 136 +MAIL_DIR/cur/33:2,\r
 137 +MAIL_DIR/cur/34:2,\r
 138 +MAIL_DIR/cur/35:2,\r
 139 +MAIL_DIR/cur/36:2,\r
 140 +MAIL_DIR/cur/37:2,\r
 141 +MAIL_DIR/cur/38:2,\r
 142 +MAIL_DIR/cur/39:2,\r
 143 +MAIL_DIR/cur/40:2,\r
 144 +MAIL_DIR/cur/41:2,\r
 145 +MAIL_DIR/cur/42:2,\r
 146 +MAIL_DIR/cur/43:2,\r
 147 +MAIL_DIR/cur/44:2,\r
 148 +MAIL_DIR/cur/45:2,\r
 149 +MAIL_DIR/cur/46:2,\r
 150 +MAIL_DIR/cur/47:2,\r
 151 +MAIL_DIR/cur/48:2,\r
 152 +MAIL_DIR/cur/49:2,\r
 153 +MAIL_DIR/cur/50:2,\r
 154 +MAIL_DIR/cur/51:2,\r
 155 +MAIL_DIR/cur/52:2,\r
 156 +MAIL_DIR/cur/53:2,\r
 157 +MAIL_DIR/foo/06:2,\r
 158  MAIL_DIR/foo/baz/11:2,\r
 159 -MAIL_DIR/foo/new/10:2,\r
 160 -MAIL_DIR/foo/new/09:2,\r
 161 +MAIL_DIR/foo/baz/12:2,\r
 162 +MAIL_DIR/foo/baz/cur/13:2,\r
 163 +MAIL_DIR/foo/baz/cur/14:2,\r
 164 +MAIL_DIR/foo/baz/new/15:2,\r
 165 +MAIL_DIR/foo/baz/new/16:2,\r
 166 +MAIL_DIR/foo/cur/07:2,\r
 167  MAIL_DIR/foo/cur/08:2,\r
 168 -MAIL_DIR/foo/06:2,\r
 169 -MAIL_DIR/bar/baz/05:2,\r
 170 -MAIL_DIR/new/04:2,\r
 171  MAIL_DIR/foo/new/03:2,\r
 172 -MAIL_DIR/foo/cur/07:2,\r
 173 -MAIL_DIR/02:2,\r
 174 -MAIL_DIR/01:2,\r
 175 +MAIL_DIR/foo/new/09:2,\r
 176 +MAIL_DIR/foo/new/10:2,\r
 177 +MAIL_DIR/new/04:2,\r
 178  EOF\r
 179  test_expect_equal_file OUTPUT EXPECTED\r
 180  \r
 181 +dup1=$(notmuch search --output=files id:20091117232137.GA7669@griffis1.net | head -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,")\r
 182 +dup2=$(notmuch search --output=files id:20091117232137.GA7669@griffis1.net | tail -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,")\r
 183 +\r
 184  test_begin_subtest "--output=files --duplicate=1"\r
 185 -notmuch search --output=files --duplicate=1 '*' | notmuch_search_files_sanitize >OUTPUT\r
 186 -cat <<EOF >EXPECTED\r
 187 +notmuch search --output=files --duplicate=1 '*' | notmuch_search_files_sanitize | sort >OUTPUT\r
 188 +cat <<EOF | sort >EXPECTED\r
 189 +$dup1\r
 190  MAIL_DIR/cur/52:2,\r
 191  MAIL_DIR/cur/53:2,\r
 192  MAIL_DIR/cur/50:2,\r
 193 @@ -275,7 +279,6 @@ MAIL_DIR/bar/baz/23:2,\r
 194  MAIL_DIR/bar/new/22:2,\r
 195  MAIL_DIR/bar/new/21:2,\r
 196  MAIL_DIR/bar/cur/19:2,\r
 197 -MAIL_DIR/bar/18:2,\r
 198  MAIL_DIR/bar/cur/20:2,\r
 199  MAIL_DIR/bar/17:2,\r
 200  MAIL_DIR/foo/baz/new/16:2,\r
 201 @@ -298,8 +301,9 @@ EOF\r
 202  test_expect_equal_file OUTPUT EXPECTED\r
 203  \r
 204  test_begin_subtest "--output=files --format=json"\r
 205 -notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize >OUTPUT\r
 206 -cat <<EOF >EXPECTED\r
 207 +notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize \\r
 208 +    | test_sort_json >OUTPUT\r
 209 +cat <<EOF | test_sort_json >EXPECTED\r
 210  ["MAIL_DIR/cur/52:2,",\r
 211  "MAIL_DIR/cur/53:2,",\r
 212  "MAIL_DIR/cur/50:2,",\r
 213 @@ -359,7 +363,7 @@ test_expect_equal_file OUTPUT EXPECTED\r
 214  test_begin_subtest "--output=files --format=json --duplicate=2"\r
 215  notmuch search --format=json --output=files --duplicate=2 '*' | notmuch_search_files_sanitize >OUTPUT\r
 216  cat <<EOF >EXPECTED\r
 217 -["MAIL_DIR/cur/51:2,"]\r
 218 +["$dup2"]\r
 219  EOF\r
 220  test_expect_equal_file OUTPUT EXPECTED\r
 221  \r
 222 diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
 223 index 56cee02..67bbf31 100755\r
 224 --- a/test/T530-upgrade.sh\r
 225 +++ b/test/T530-upgrade.sh\r
 226 @@ -3,7 +3,7 @@ test_description="database upgrade"\r
 227  \r
 228  . ./test-lib.sh\r
 229  \r
 230 -dbtarball=folders-v1.tar.xz\r
 231 +dbtarball=database-v1.tar.xz\r
 232  \r
 233  # XXX: Accomplish the same with test lib helpers\r
 234  if [ ! -e ${TEST_DIRECTORY}/test-databases/${dbtarball} ]; then\r
 235 diff --git a/test/test-databases/Makefile.local b/test/test-databases/Makefile.local\r
 236 index e777ada..0572e78 100644\r
 237 --- a/test/test-databases/Makefile.local\r
 238 +++ b/test/test-databases/Makefile.local\r
 239 @@ -4,7 +4,7 @@ TEST_DATABASE_MIRROR=http://notmuchmail.org/releases/test-databases\r
 240  \r
 241  dir := test/test-databases\r
 242  \r
 243 -test_databases := $(dir)/folders-v1.tar.xz\r
 244 +test_databases := $(dir)/database-v1.tar.xz\r
 245  \r
 246  %.tar.xz:\r
 247         wget -nv -O $@ ${TEST_DATABASE_MIRROR}/$(notdir $@);\r
 248 diff --git a/test/test-databases/database-v1.tar.xz.sha256 b/test/test-databases/database-v1.tar.xz.sha256\r
 249 new file mode 100644\r
 250 index 0000000..2cc4f96\r
 251 --- /dev/null\r
 252 +++ b/test/test-databases/database-v1.tar.xz.sha256\r
 253 @@ -0,0 +1 @@\r
 254 +4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2  database-v1.tar.xz\r
 255 diff --git a/test/test-databases/folders-v1.tar.xz.sha256 b/test/test-databases/folders-v1.tar.xz.sha256\r
 256 deleted file mode 100644\r
 257 index 01ad79d..0000000\r
 258 --- a/test/test-databases/folders-v1.tar.xz.sha256\r
 259 +++ /dev/null\r
 260 @@ -1 +0,0 @@\r
 261 -ace8a61216756b90a421e23d03910e1228bcb910e197c35e51e29f2cf57b37d9  folders-v1.tar.xz\r
 262 diff --git a/test/test-lib.sh b/test/test-lib.sh\r
 263 index 837c669..8697d6a 100644\r
 264 --- a/test/test-lib.sh\r
 265 +++ b/test/test-lib.sh\r
 266 @@ -622,6 +622,12 @@ test_expect_equal_json () {\r
 267      test_expect_equal "$output" "$expected" "$@"\r
 268  }\r
 269  \r
 270 +# Sort the top-level list of JSON data from stdin.\r
 271 +test_sort_json () {\r
 272 +    PYTHONIOENCODING=utf-8 python -c \\r
 273 +        "import sys, json; json.dump(sorted(json.load(sys.stdin)),sys.stdout)"\r
 274 +}\r
 275 +\r
 276  test_emacs_expect_t () {\r
 277         test "$#" = 2 && { prereq=$1; shift; } || prereq=\r
 278         test "$#" = 1 ||\r