b5/aab7f3906879f9847edb2797f3f970427bed17

   1 Return-Path: <bremner@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 1C117431E82\r
   6         for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:14:44 -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 Dbi1YWtgGtCG for <notmuch@notmuchmail.org>;\r
  16         Tue, 11 Mar 2014 16:14:39 -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 10CC3431FDF\r
  21         for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:14:39 -0700 (PDT)\r
  22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
  23         (envelope-from <bremner@tethera.net>)\r
  24         id 1WNVsc-00022X-7h; Tue, 11 Mar 2014 20:14:38 -0300\r
  25 Received: (nullmailer pid 1247 invoked by uid 1000); Tue, 11 Mar 2014\r
  26         23:14:34 -0000\r
  27 From: David Bremner <david@tethera.net>\r
  28 To: notmuch@notmuchmail.org\r
  29 Subject: [PATCH] test: rearrange the test corpus into subfolders, fix tests\r
  30 Date: Tue, 11 Mar 2014 20:14:27 -0300\r
  31 Message-Id: <1394579667-1179-1-git-send-email-david@tethera.net>\r
  32 X-Mailer: git-send-email 1.8.5.3\r
  33 In-Reply-To: <1394578900-25618-3-git-send-email-david@tethera.net>\r
  34 References: <1394578900-25618-3-git-send-email-david@tethera.net>\r
  35 X-BeenThere: notmuch@notmuchmail.org\r
  36 X-Mailman-Version: 2.1.13\r
  37 Precedence: list\r
  38 List-Id: "Use and development of the notmuch mail system."\r
  39         <notmuch.notmuchmail.org>\r
  40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  41         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  42 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  43 List-Post: <mailto:notmuch@notmuchmail.org>\r
  44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  46         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  47 X-List-Received-Date: Tue, 11 Mar 2014 23:14:44 -0000\r
  48 \r
  49 From: Jani Nikula <jani@nikula.org>\r
  50 \r
  51 We will need this for improved folder search tests, but having some\r
  52 folders should exercise our code paths better anyway.\r
  53 \r
  54 Modify the relevant test accordingly to make it pass.\r
  55 \r
  56 This reorganization triggers a bug in the test suite, namely that it\r
  57 expects the output of --output=files to be in a certain order. So we\r
  58 add the fix for that into the same commit.\r
  59 \r
  60 This mainly involves sorting, although the case --duplicate=$n\r
  61 requires more subtlety.\r
  62 ---\r
  63 \r
  64 curses, I forget -M on this the first time which made it 200k\r
  65 \r
  66  test/T090-search-output.sh             | 230 +++++++++++++++++----------------\r
  67  test/corpus/{cur => }/01:2,            |   0\r
  68  test/corpus/{cur => }/02:2,            |   0\r
  69  test/corpus/{cur => bar}/17:2,         |   0\r
  70  test/corpus/{cur => bar}/18:2,         |   0\r
  71  test/corpus/{cur => bar/baz}/05:2,     |   0\r
  72  test/corpus/{cur => bar/baz}/23:2,     |   0\r
  73  test/corpus/{cur => bar/baz}/24:2,     |   0\r
  74  test/corpus/{ => bar/baz}/cur/25:2,    |   0\r
  75  test/corpus/{ => bar/baz}/cur/26:2,    |   0\r
  76  test/corpus/{cur => bar/baz/new}/27:2, |   0\r
  77  test/corpus/{cur => bar/baz/new}/28:2, |   0\r
  78  test/corpus/{ => bar}/cur/19:2,        |   0\r
  79  test/corpus/{ => bar}/cur/20:2,        |   0\r
  80  test/corpus/{cur => bar/new}/21:2,     |   0\r
  81  test/corpus/{cur => bar/new}/22:2,     |   0\r
  82  test/corpus/{cur => foo}/06:2,         |   0\r
  83  test/corpus/{cur => foo/baz}/11:2,     |   0\r
  84  test/corpus/{cur => foo/baz}/12:2,     |   0\r
  85  test/corpus/{ => foo/baz}/cur/13:2,    |   0\r
  86  test/corpus/{ => foo/baz}/cur/14:2,    |   0\r
  87  test/corpus/{cur => foo/baz/new}/15:2, |   0\r
  88  test/corpus/{cur => foo/baz/new}/16:2, |   0\r
  89  test/corpus/{ => foo}/cur/07:2,        |   0\r
  90  test/corpus/{ => foo}/cur/08:2,        |   0\r
  91  test/corpus/{cur => foo/new}/03:2,     |   0\r
  92  test/corpus/{cur => foo/new}/09:2,     |   0\r
  93  test/corpus/{cur => foo/new}/10:2,     |   0\r
  94  test/corpus/{cur => new}/04:2,         |   0\r
  95  29 files changed, 117 insertions(+), 113 deletions(-)\r
  96  rename test/corpus/{cur => }/01:2, (100%)\r
  97  rename test/corpus/{cur => }/02:2, (100%)\r
  98  rename test/corpus/{cur => bar}/17:2, (100%)\r
  99  rename test/corpus/{cur => bar}/18:2, (100%)\r
 100  rename test/corpus/{cur => bar/baz}/05:2, (100%)\r
 101  rename test/corpus/{cur => bar/baz}/23:2, (100%)\r
 102  rename test/corpus/{cur => bar/baz}/24:2, (100%)\r
 103  rename test/corpus/{ => bar/baz}/cur/25:2, (100%)\r
 104  rename test/corpus/{ => bar/baz}/cur/26:2, (100%)\r
 105  rename test/corpus/{cur => bar/baz/new}/27:2, (100%)\r
 106  rename test/corpus/{cur => bar/baz/new}/28:2, (100%)\r
 107  rename test/corpus/{ => bar}/cur/19:2, (100%)\r
 108  rename test/corpus/{ => bar}/cur/20:2, (100%)\r
 109  rename test/corpus/{cur => bar/new}/21:2, (100%)\r
 110  rename test/corpus/{cur => bar/new}/22:2, (100%)\r
 111  rename test/corpus/{cur => foo}/06:2, (100%)\r
 112  rename test/corpus/{cur => foo/baz}/11:2, (100%)\r
 113  rename test/corpus/{cur => foo/baz}/12:2, (100%)\r
 114  rename test/corpus/{ => foo/baz}/cur/13:2, (100%)\r
 115  rename test/corpus/{ => foo/baz}/cur/14:2, (100%)\r
 116  rename test/corpus/{cur => foo/baz/new}/15:2, (100%)\r
 117  rename test/corpus/{cur => foo/baz/new}/16:2, (100%)\r
 118  rename test/corpus/{ => foo}/cur/07:2, (100%)\r
 119  rename test/corpus/{ => foo}/cur/08:2, (100%)\r
 120  rename test/corpus/{cur => foo/new}/03:2, (100%)\r
 121  rename test/corpus/{cur => foo/new}/09:2, (100%)\r
 122  rename test/corpus/{cur => foo/new}/10:2, (100%)\r
 123  rename test/corpus/{cur => new}/04:2, (100%)\r
 124 \r
 125 diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh\r
 126 index a8ab920..947d572 100755\r
 127 --- a/test/T090-search-output.sh\r
 128 +++ b/test/T090-search-output.sh\r
 129 @@ -181,67 +181,71 @@ EOF\r
 130  test_expect_equal_file OUTPUT EXPECTED\r
 131  \r
 132  test_begin_subtest "--output=files"\r
 133 -notmuch search --output=files '*' | notmuch_search_files_sanitize >OUTPUT\r
 134 +notmuch search --output=files '*' | notmuch_search_files_sanitize | sort >OUTPUT\r
 135  cat <<EOF >EXPECTED\r
 136 -MAIL_DIR/cur/52:2,\r
 137 -MAIL_DIR/cur/53:2,\r
 138 -MAIL_DIR/cur/50:2,\r
 139 -MAIL_DIR/cur/49:2,\r
 140 -MAIL_DIR/cur/48:2,\r
 141 -MAIL_DIR/cur/47:2,\r
 142 -MAIL_DIR/cur/46:2,\r
 143 -MAIL_DIR/cur/45:2,\r
 144 -MAIL_DIR/cur/44:2,\r
 145 -MAIL_DIR/cur/43:2,\r
 146 -MAIL_DIR/cur/42:2,\r
 147 -MAIL_DIR/cur/41:2,\r
 148 -MAIL_DIR/cur/40:2,\r
 149 -MAIL_DIR/cur/39:2,\r
 150 -MAIL_DIR/cur/38:2,\r
 151 -MAIL_DIR/cur/37:2,\r
 152 -MAIL_DIR/cur/36:2,\r
 153 -MAIL_DIR/cur/35:2,\r
 154 -MAIL_DIR/cur/34:2,\r
 155 -MAIL_DIR/cur/33:2,\r
 156 -MAIL_DIR/cur/32:2,\r
 157 -MAIL_DIR/cur/31:2,\r
 158 -MAIL_DIR/cur/30:2,\r
 159 +MAIL_DIR/01:2,\r
 160 +MAIL_DIR/02:2,\r
 161 +MAIL_DIR/bar/17:2,\r
 162 +MAIL_DIR/bar/18:2,\r
 163 +MAIL_DIR/bar/baz/05:2,\r
 164 +MAIL_DIR/bar/baz/23:2,\r
 165 +MAIL_DIR/bar/baz/24:2,\r
 166 +MAIL_DIR/bar/baz/cur/25:2,\r
 167 +MAIL_DIR/bar/baz/cur/26:2,\r
 168 +MAIL_DIR/bar/baz/new/27:2,\r
 169 +MAIL_DIR/bar/baz/new/28:2,\r
 170 +MAIL_DIR/bar/cur/19:2,\r
 171 +MAIL_DIR/bar/cur/20:2,\r
 172 +MAIL_DIR/bar/new/21:2,\r
 173 +MAIL_DIR/bar/new/22:2,\r
 174  MAIL_DIR/cur/29:2,\r
 175 -MAIL_DIR/cur/28:2,\r
 176 -MAIL_DIR/cur/27:2,\r
 177 -MAIL_DIR/cur/26:2,\r
 178 -MAIL_DIR/cur/25:2,\r
 179 -MAIL_DIR/cur/24:2,\r
 180 -MAIL_DIR/cur/23:2,\r
 181 -MAIL_DIR/cur/22:2,\r
 182 -MAIL_DIR/cur/21:2,\r
 183 -MAIL_DIR/cur/19:2,\r
 184 -MAIL_DIR/cur/18:2,\r
 185 +MAIL_DIR/cur/30:2,\r
 186 +MAIL_DIR/cur/31:2,\r
 187 +MAIL_DIR/cur/32:2,\r
 188 +MAIL_DIR/cur/33:2,\r
 189 +MAIL_DIR/cur/34:2,\r
 190 +MAIL_DIR/cur/35:2,\r
 191 +MAIL_DIR/cur/36:2,\r
 192 +MAIL_DIR/cur/37:2,\r
 193 +MAIL_DIR/cur/38:2,\r
 194 +MAIL_DIR/cur/39:2,\r
 195 +MAIL_DIR/cur/40:2,\r
 196 +MAIL_DIR/cur/41:2,\r
 197 +MAIL_DIR/cur/42:2,\r
 198 +MAIL_DIR/cur/43:2,\r
 199 +MAIL_DIR/cur/44:2,\r
 200 +MAIL_DIR/cur/45:2,\r
 201 +MAIL_DIR/cur/46:2,\r
 202 +MAIL_DIR/cur/47:2,\r
 203 +MAIL_DIR/cur/48:2,\r
 204 +MAIL_DIR/cur/49:2,\r
 205 +MAIL_DIR/cur/50:2,\r
 206  MAIL_DIR/cur/51:2,\r
 207 -MAIL_DIR/cur/20:2,\r
 208 -MAIL_DIR/cur/17:2,\r
 209 -MAIL_DIR/cur/16:2,\r
 210 -MAIL_DIR/cur/15:2,\r
 211 -MAIL_DIR/cur/14:2,\r
 212 -MAIL_DIR/cur/13:2,\r
 213 -MAIL_DIR/cur/12:2,\r
 214 -MAIL_DIR/cur/11:2,\r
 215 -MAIL_DIR/cur/10:2,\r
 216 -MAIL_DIR/cur/09:2,\r
 217 -MAIL_DIR/cur/08:2,\r
 218 -MAIL_DIR/cur/06:2,\r
 219 -MAIL_DIR/cur/05:2,\r
 220 -MAIL_DIR/cur/04:2,\r
 221 -MAIL_DIR/cur/03:2,\r
 222 -MAIL_DIR/cur/07:2,\r
 223 -MAIL_DIR/cur/02:2,\r
 224 -MAIL_DIR/cur/01:2,\r
 225 +MAIL_DIR/cur/52:2,\r
 226 +MAIL_DIR/cur/53:2,\r
 227 +MAIL_DIR/foo/06:2,\r
 228 +MAIL_DIR/foo/baz/11:2,\r
 229 +MAIL_DIR/foo/baz/12:2,\r
 230 +MAIL_DIR/foo/baz/cur/13:2,\r
 231 +MAIL_DIR/foo/baz/cur/14:2,\r
 232 +MAIL_DIR/foo/baz/new/15:2,\r
 233 +MAIL_DIR/foo/baz/new/16:2,\r
 234 +MAIL_DIR/foo/cur/07:2,\r
 235 +MAIL_DIR/foo/cur/08:2,\r
 236 +MAIL_DIR/foo/new/03:2,\r
 237 +MAIL_DIR/foo/new/09:2,\r
 238 +MAIL_DIR/foo/new/10:2,\r
 239 +MAIL_DIR/new/04:2,\r
 240  EOF\r
 241  test_expect_equal_file OUTPUT EXPECTED\r
 242  \r
 243 +dup1=$(notmuch search --output=files id:20091117232137.GA7669@griffis1.net | head -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,")\r
 244 +dup2=$(notmuch search --output=files id:20091117232137.GA7669@griffis1.net | tail -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,")\r
 245 +\r
 246  test_begin_subtest "--output=files --duplicate=1"\r
 247 -notmuch search --output=files --duplicate=1 '*' | notmuch_search_files_sanitize >OUTPUT\r
 248 -cat <<EOF >EXPECTED\r
 249 +notmuch search --output=files --duplicate=1 '*' | notmuch_search_files_sanitize | sort >OUTPUT\r
 250 +cat <<EOF | sort >EXPECTED\r
 251 +$dup1\r
 252  MAIL_DIR/cur/52:2,\r
 253  MAIL_DIR/cur/53:2,\r
 254  MAIL_DIR/cur/50:2,\r
 255 @@ -266,40 +270,40 @@ MAIL_DIR/cur/32:2,\r
 256  MAIL_DIR/cur/31:2,\r
 257  MAIL_DIR/cur/30:2,\r
 258  MAIL_DIR/cur/29:2,\r
 259 -MAIL_DIR/cur/28:2,\r
 260 -MAIL_DIR/cur/27:2,\r
 261 -MAIL_DIR/cur/26:2,\r
 262 -MAIL_DIR/cur/25:2,\r
 263 -MAIL_DIR/cur/24:2,\r
 264 -MAIL_DIR/cur/23:2,\r
 265 -MAIL_DIR/cur/22:2,\r
 266 -MAIL_DIR/cur/21:2,\r
 267 -MAIL_DIR/cur/19:2,\r
 268 -MAIL_DIR/cur/18:2,\r
 269 -MAIL_DIR/cur/20:2,\r
 270 -MAIL_DIR/cur/17:2,\r
 271 -MAIL_DIR/cur/16:2,\r
 272 -MAIL_DIR/cur/15:2,\r
 273 -MAIL_DIR/cur/14:2,\r
 274 -MAIL_DIR/cur/13:2,\r
 275 -MAIL_DIR/cur/12:2,\r
 276 -MAIL_DIR/cur/11:2,\r
 277 -MAIL_DIR/cur/10:2,\r
 278 -MAIL_DIR/cur/09:2,\r
 279 -MAIL_DIR/cur/08:2,\r
 280 -MAIL_DIR/cur/06:2,\r
 281 -MAIL_DIR/cur/05:2,\r
 282 -MAIL_DIR/cur/04:2,\r
 283 -MAIL_DIR/cur/03:2,\r
 284 -MAIL_DIR/cur/07:2,\r
 285 -MAIL_DIR/cur/02:2,\r
 286 -MAIL_DIR/cur/01:2,\r
 287 +MAIL_DIR/bar/baz/new/28:2,\r
 288 +MAIL_DIR/bar/baz/new/27:2,\r
 289 +MAIL_DIR/bar/baz/cur/26:2,\r
 290 +MAIL_DIR/bar/baz/cur/25:2,\r
 291 +MAIL_DIR/bar/baz/24:2,\r
 292 +MAIL_DIR/bar/baz/23:2,\r
 293 +MAIL_DIR/bar/new/22:2,\r
 294 +MAIL_DIR/bar/new/21:2,\r
 295 +MAIL_DIR/bar/cur/19:2,\r
 296 +MAIL_DIR/bar/cur/20:2,\r
 297 +MAIL_DIR/bar/17:2,\r
 298 +MAIL_DIR/foo/baz/new/16:2,\r
 299 +MAIL_DIR/foo/baz/new/15:2,\r
 300 +MAIL_DIR/foo/baz/cur/14:2,\r
 301 +MAIL_DIR/foo/baz/cur/13:2,\r
 302 +MAIL_DIR/foo/baz/12:2,\r
 303 +MAIL_DIR/foo/baz/11:2,\r
 304 +MAIL_DIR/foo/new/10:2,\r
 305 +MAIL_DIR/foo/new/09:2,\r
 306 +MAIL_DIR/foo/cur/08:2,\r
 307 +MAIL_DIR/foo/06:2,\r
 308 +MAIL_DIR/bar/baz/05:2,\r
 309 +MAIL_DIR/new/04:2,\r
 310 +MAIL_DIR/foo/new/03:2,\r
 311 +MAIL_DIR/foo/cur/07:2,\r
 312 +MAIL_DIR/02:2,\r
 313 +MAIL_DIR/01:2,\r
 314  EOF\r
 315  test_expect_equal_file OUTPUT EXPECTED\r
 316  \r
 317  test_begin_subtest "--output=files --format=json"\r
 318 -notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize >OUTPUT\r
 319 -cat <<EOF >EXPECTED\r
 320 +notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize \\r
 321 +    | test_sort_json >OUTPUT\r
 322 +cat <<EOF | test_sort_json >EXPECTED\r
 323  ["MAIL_DIR/cur/52:2,",\r
 324  "MAIL_DIR/cur/53:2,",\r
 325  "MAIL_DIR/cur/50:2,",\r
 326 @@ -324,42 +328,42 @@ cat <<EOF >EXPECTED\r
 327  "MAIL_DIR/cur/31:2,",\r
 328  "MAIL_DIR/cur/30:2,",\r
 329  "MAIL_DIR/cur/29:2,",\r
 330 -"MAIL_DIR/cur/28:2,",\r
 331 -"MAIL_DIR/cur/27:2,",\r
 332 -"MAIL_DIR/cur/26:2,",\r
 333 -"MAIL_DIR/cur/25:2,",\r
 334 -"MAIL_DIR/cur/24:2,",\r
 335 -"MAIL_DIR/cur/23:2,",\r
 336 -"MAIL_DIR/cur/22:2,",\r
 337 -"MAIL_DIR/cur/21:2,",\r
 338 -"MAIL_DIR/cur/19:2,",\r
 339 -"MAIL_DIR/cur/18:2,",\r
 340 +"MAIL_DIR/bar/baz/new/28:2,",\r
 341 +"MAIL_DIR/bar/baz/new/27:2,",\r
 342 +"MAIL_DIR/bar/baz/cur/26:2,",\r
 343 +"MAIL_DIR/bar/baz/cur/25:2,",\r
 344 +"MAIL_DIR/bar/baz/24:2,",\r
 345 +"MAIL_DIR/bar/baz/23:2,",\r
 346 +"MAIL_DIR/bar/new/22:2,",\r
 347 +"MAIL_DIR/bar/new/21:2,",\r
 348 +"MAIL_DIR/bar/cur/19:2,",\r
 349 +"MAIL_DIR/bar/18:2,",\r
 350  "MAIL_DIR/cur/51:2,",\r
 351 -"MAIL_DIR/cur/20:2,",\r
 352 -"MAIL_DIR/cur/17:2,",\r
 353 -"MAIL_DIR/cur/16:2,",\r
 354 -"MAIL_DIR/cur/15:2,",\r
 355 -"MAIL_DIR/cur/14:2,",\r
 356 -"MAIL_DIR/cur/13:2,",\r
 357 -"MAIL_DIR/cur/12:2,",\r
 358 -"MAIL_DIR/cur/11:2,",\r
 359 -"MAIL_DIR/cur/10:2,",\r
 360 -"MAIL_DIR/cur/09:2,",\r
 361 -"MAIL_DIR/cur/08:2,",\r
 362 -"MAIL_DIR/cur/06:2,",\r
 363 -"MAIL_DIR/cur/05:2,",\r
 364 -"MAIL_DIR/cur/04:2,",\r
 365 -"MAIL_DIR/cur/03:2,",\r
 366 -"MAIL_DIR/cur/07:2,",\r
 367 -"MAIL_DIR/cur/02:2,",\r
 368 -"MAIL_DIR/cur/01:2,"]\r
 369 +"MAIL_DIR/bar/cur/20:2,",\r
 370 +"MAIL_DIR/bar/17:2,",\r
 371 +"MAIL_DIR/foo/baz/new/16:2,",\r
 372 +"MAIL_DIR/foo/baz/new/15:2,",\r
 373 +"MAIL_DIR/foo/baz/cur/14:2,",\r
 374 +"MAIL_DIR/foo/baz/cur/13:2,",\r
 375 +"MAIL_DIR/foo/baz/12:2,",\r
 376 +"MAIL_DIR/foo/baz/11:2,",\r
 377 +"MAIL_DIR/foo/new/10:2,",\r
 378 +"MAIL_DIR/foo/new/09:2,",\r
 379 +"MAIL_DIR/foo/cur/08:2,",\r
 380 +"MAIL_DIR/foo/06:2,",\r
 381 +"MAIL_DIR/bar/baz/05:2,",\r
 382 +"MAIL_DIR/new/04:2,",\r
 383 +"MAIL_DIR/foo/new/03:2,",\r
 384 +"MAIL_DIR/foo/cur/07:2,",\r
 385 +"MAIL_DIR/02:2,",\r
 386 +"MAIL_DIR/01:2,"]\r
 387  EOF\r
 388  test_expect_equal_file OUTPUT EXPECTED\r
 389  \r
 390  test_begin_subtest "--output=files --format=json --duplicate=2"\r
 391  notmuch search --format=json --output=files --duplicate=2 '*' | notmuch_search_files_sanitize >OUTPUT\r
 392  cat <<EOF >EXPECTED\r
 393 -["MAIL_DIR/cur/51:2,"]\r
 394 +["$dup2"]\r
 395  EOF\r
 396  test_expect_equal_file OUTPUT EXPECTED\r
 397  \r
 398 diff --git a/test/corpus/cur/01:2, b/test/corpus/01:2,\r
 399 similarity index 100%\r
 400 rename from test/corpus/cur/01:2,\r
 401 rename to test/corpus/01:2,\r
 402 diff --git a/test/corpus/cur/02:2, b/test/corpus/02:2,\r
 403 similarity index 100%\r
 404 rename from test/corpus/cur/02:2,\r
 405 rename to test/corpus/02:2,\r
 406 diff --git a/test/corpus/cur/17:2, b/test/corpus/bar/17:2,\r
 407 similarity index 100%\r
 408 rename from test/corpus/cur/17:2,\r
 409 rename to test/corpus/bar/17:2,\r
 410 diff --git a/test/corpus/cur/18:2, b/test/corpus/bar/18:2,\r
 411 similarity index 100%\r
 412 rename from test/corpus/cur/18:2,\r
 413 rename to test/corpus/bar/18:2,\r
 414 diff --git a/test/corpus/cur/05:2, b/test/corpus/bar/baz/05:2,\r
 415 similarity index 100%\r
 416 rename from test/corpus/cur/05:2,\r
 417 rename to test/corpus/bar/baz/05:2,\r
 418 diff --git a/test/corpus/cur/23:2, b/test/corpus/bar/baz/23:2,\r
 419 similarity index 100%\r
 420 rename from test/corpus/cur/23:2,\r
 421 rename to test/corpus/bar/baz/23:2,\r
 422 diff --git a/test/corpus/cur/24:2, b/test/corpus/bar/baz/24:2,\r
 423 similarity index 100%\r
 424 rename from test/corpus/cur/24:2,\r
 425 rename to test/corpus/bar/baz/24:2,\r
 426 diff --git a/test/corpus/cur/25:2, b/test/corpus/bar/baz/cur/25:2,\r
 427 similarity index 100%\r
 428 rename from test/corpus/cur/25:2,\r
 429 rename to test/corpus/bar/baz/cur/25:2,\r
 430 diff --git a/test/corpus/cur/26:2, b/test/corpus/bar/baz/cur/26:2,\r
 431 similarity index 100%\r
 432 rename from test/corpus/cur/26:2,\r
 433 rename to test/corpus/bar/baz/cur/26:2,\r
 434 diff --git a/test/corpus/cur/27:2, b/test/corpus/bar/baz/new/27:2,\r
 435 similarity index 100%\r
 436 rename from test/corpus/cur/27:2,\r
 437 rename to test/corpus/bar/baz/new/27:2,\r
 438 diff --git a/test/corpus/cur/28:2, b/test/corpus/bar/baz/new/28:2,\r
 439 similarity index 100%\r
 440 rename from test/corpus/cur/28:2,\r
 441 rename to test/corpus/bar/baz/new/28:2,\r
 442 diff --git a/test/corpus/cur/19:2, b/test/corpus/bar/cur/19:2,\r
 443 similarity index 100%\r
 444 rename from test/corpus/cur/19:2,\r
 445 rename to test/corpus/bar/cur/19:2,\r
 446 diff --git a/test/corpus/cur/20:2, b/test/corpus/bar/cur/20:2,\r
 447 similarity index 100%\r
 448 rename from test/corpus/cur/20:2,\r
 449 rename to test/corpus/bar/cur/20:2,\r
 450 diff --git a/test/corpus/cur/21:2, b/test/corpus/bar/new/21:2,\r
 451 similarity index 100%\r
 452 rename from test/corpus/cur/21:2,\r
 453 rename to test/corpus/bar/new/21:2,\r
 454 diff --git a/test/corpus/cur/22:2, b/test/corpus/bar/new/22:2,\r
 455 similarity index 100%\r
 456 rename from test/corpus/cur/22:2,\r
 457 rename to test/corpus/bar/new/22:2,\r
 458 diff --git a/test/corpus/cur/06:2, b/test/corpus/foo/06:2,\r
 459 similarity index 100%\r
 460 rename from test/corpus/cur/06:2,\r
 461 rename to test/corpus/foo/06:2,\r
 462 diff --git a/test/corpus/cur/11:2, b/test/corpus/foo/baz/11:2,\r
 463 similarity index 100%\r
 464 rename from test/corpus/cur/11:2,\r
 465 rename to test/corpus/foo/baz/11:2,\r
 466 diff --git a/test/corpus/cur/12:2, b/test/corpus/foo/baz/12:2,\r
 467 similarity index 100%\r
 468 rename from test/corpus/cur/12:2,\r
 469 rename to test/corpus/foo/baz/12:2,\r
 470 diff --git a/test/corpus/cur/13:2, b/test/corpus/foo/baz/cur/13:2,\r
 471 similarity index 100%\r
 472 rename from test/corpus/cur/13:2,\r
 473 rename to test/corpus/foo/baz/cur/13:2,\r
 474 diff --git a/test/corpus/cur/14:2, b/test/corpus/foo/baz/cur/14:2,\r
 475 similarity index 100%\r
 476 rename from test/corpus/cur/14:2,\r
 477 rename to test/corpus/foo/baz/cur/14:2,\r
 478 diff --git a/test/corpus/cur/15:2, b/test/corpus/foo/baz/new/15:2,\r
 479 similarity index 100%\r
 480 rename from test/corpus/cur/15:2,\r
 481 rename to test/corpus/foo/baz/new/15:2,\r
 482 diff --git a/test/corpus/cur/16:2, b/test/corpus/foo/baz/new/16:2,\r
 483 similarity index 100%\r
 484 rename from test/corpus/cur/16:2,\r
 485 rename to test/corpus/foo/baz/new/16:2,\r
 486 diff --git a/test/corpus/cur/07:2, b/test/corpus/foo/cur/07:2,\r
 487 similarity index 100%\r
 488 rename from test/corpus/cur/07:2,\r
 489 rename to test/corpus/foo/cur/07:2,\r
 490 diff --git a/test/corpus/cur/08:2, b/test/corpus/foo/cur/08:2,\r
 491 similarity index 100%\r
 492 rename from test/corpus/cur/08:2,\r
 493 rename to test/corpus/foo/cur/08:2,\r
 494 diff --git a/test/corpus/cur/03:2, b/test/corpus/foo/new/03:2,\r
 495 similarity index 100%\r
 496 rename from test/corpus/cur/03:2,\r
 497 rename to test/corpus/foo/new/03:2,\r
 498 diff --git a/test/corpus/cur/09:2, b/test/corpus/foo/new/09:2,\r
 499 similarity index 100%\r
 500 rename from test/corpus/cur/09:2,\r
 501 rename to test/corpus/foo/new/09:2,\r
 502 diff --git a/test/corpus/cur/10:2, b/test/corpus/foo/new/10:2,\r
 503 similarity index 100%\r
 504 rename from test/corpus/cur/10:2,\r
 505 rename to test/corpus/foo/new/10:2,\r
 506 diff --git a/test/corpus/cur/04:2, b/test/corpus/new/04:2,\r
 507 similarity index 100%\r
 508 rename from test/corpus/cur/04:2,\r
 509 rename to test/corpus/new/04:2,\r
 510 -- \r
 511 1.8.5.3\r
 512 \r