diff options
-rwxr-xr-x | test/T090-search-output.sh | 230 | ||||
-rw-r--r-- | test/corpus/01:2, (renamed from test/corpus/cur/01:2,) | 0 | ||||
-rw-r--r-- | test/corpus/02:2, (renamed from test/corpus/cur/02:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/17:2, (renamed from test/corpus/cur/17:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/18:2, (renamed from test/corpus/cur/18:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/baz/05:2, (renamed from test/corpus/cur/05:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/baz/23:2, (renamed from test/corpus/cur/23:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/baz/24:2, (renamed from test/corpus/cur/24:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/baz/cur/25:2, (renamed from test/corpus/cur/25:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/baz/cur/26:2, (renamed from test/corpus/cur/26:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/baz/new/27:2, (renamed from test/corpus/cur/27:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/baz/new/28:2, (renamed from test/corpus/cur/28:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/cur/19:2, (renamed from test/corpus/cur/19:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/cur/20:2, (renamed from test/corpus/cur/20:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/new/21:2, (renamed from test/corpus/cur/21:2,) | 0 | ||||
-rw-r--r-- | test/corpus/bar/new/22:2, (renamed from test/corpus/cur/22:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/06:2, (renamed from test/corpus/cur/06:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/baz/11:2, (renamed from test/corpus/cur/11:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/baz/12:2, (renamed from test/corpus/cur/12:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/baz/cur/13:2, (renamed from test/corpus/cur/13:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/baz/cur/14:2, (renamed from test/corpus/cur/14:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/baz/new/15:2, (renamed from test/corpus/cur/15:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/baz/new/16:2, (renamed from test/corpus/cur/16:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/cur/07:2, (renamed from test/corpus/cur/07:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/cur/08:2, (renamed from test/corpus/cur/08:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/new/03:2, (renamed from test/corpus/cur/03:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/new/09:2, (renamed from test/corpus/cur/09:2,) | 0 | ||||
-rw-r--r-- | test/corpus/foo/new/10:2, (renamed from test/corpus/cur/10:2,) | 0 | ||||
-rw-r--r-- | test/corpus/new/04:2, (renamed from test/corpus/cur/04:2,) | 0 |
29 files changed, 117 insertions, 113 deletions
diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh index a8ab9205..947d572e 100755 --- a/test/T090-search-output.sh +++ b/test/T090-search-output.sh @@ -181,67 +181,71 @@ EOF test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "--output=files" -notmuch search --output=files '*' | notmuch_search_files_sanitize >OUTPUT +notmuch search --output=files '*' | notmuch_search_files_sanitize | sort >OUTPUT cat <<EOF >EXPECTED -MAIL_DIR/cur/52:2, -MAIL_DIR/cur/53:2, -MAIL_DIR/cur/50:2, -MAIL_DIR/cur/49:2, -MAIL_DIR/cur/48:2, -MAIL_DIR/cur/47:2, -MAIL_DIR/cur/46:2, -MAIL_DIR/cur/45:2, -MAIL_DIR/cur/44:2, -MAIL_DIR/cur/43:2, -MAIL_DIR/cur/42:2, -MAIL_DIR/cur/41:2, -MAIL_DIR/cur/40:2, -MAIL_DIR/cur/39:2, -MAIL_DIR/cur/38:2, -MAIL_DIR/cur/37:2, -MAIL_DIR/cur/36:2, -MAIL_DIR/cur/35:2, -MAIL_DIR/cur/34:2, -MAIL_DIR/cur/33:2, -MAIL_DIR/cur/32:2, -MAIL_DIR/cur/31:2, -MAIL_DIR/cur/30:2, +MAIL_DIR/01:2, +MAIL_DIR/02:2, +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/29:2, -MAIL_DIR/cur/28:2, -MAIL_DIR/cur/27:2, -MAIL_DIR/cur/26:2, -MAIL_DIR/cur/25:2, -MAIL_DIR/cur/24:2, -MAIL_DIR/cur/23:2, -MAIL_DIR/cur/22:2, -MAIL_DIR/cur/21:2, -MAIL_DIR/cur/19:2, -MAIL_DIR/cur/18: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/20:2, -MAIL_DIR/cur/17:2, -MAIL_DIR/cur/16:2, -MAIL_DIR/cur/15:2, -MAIL_DIR/cur/14:2, -MAIL_DIR/cur/13:2, -MAIL_DIR/cur/12:2, -MAIL_DIR/cur/11:2, -MAIL_DIR/cur/10:2, -MAIL_DIR/cur/09:2, -MAIL_DIR/cur/08:2, -MAIL_DIR/cur/06:2, -MAIL_DIR/cur/05:2, -MAIL_DIR/cur/04:2, -MAIL_DIR/cur/03:2, -MAIL_DIR/cur/07:2, -MAIL_DIR/cur/02:2, -MAIL_DIR/cur/01:2, +MAIL_DIR/cur/52:2, +MAIL_DIR/cur/53:2, +MAIL_DIR/foo/06:2, +MAIL_DIR/foo/baz/11:2, +MAIL_DIR/foo/baz/12:2, +MAIL_DIR/foo/baz/cur/13:2, +MAIL_DIR/foo/baz/cur/14:2, +MAIL_DIR/foo/baz/new/15:2, +MAIL_DIR/foo/baz/new/16: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, +MAIL_DIR/new/04:2, EOF test_expect_equal_file OUTPUT EXPECTED +dup1=$(notmuch search --output=files id:20091117232137.GA7669@griffis1.net | head -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,") +dup2=$(notmuch search --output=files id:20091117232137.GA7669@griffis1.net | tail -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,") + test_begin_subtest "--output=files --duplicate=1" -notmuch search --output=files --duplicate=1 '*' | notmuch_search_files_sanitize >OUTPUT -cat <<EOF >EXPECTED +notmuch search --output=files --duplicate=1 '*' | notmuch_search_files_sanitize | sort >OUTPUT +cat <<EOF | sort >EXPECTED +$dup1 MAIL_DIR/cur/52:2, MAIL_DIR/cur/53:2, MAIL_DIR/cur/50:2, @@ -266,40 +270,40 @@ MAIL_DIR/cur/32:2, MAIL_DIR/cur/31:2, MAIL_DIR/cur/30:2, MAIL_DIR/cur/29:2, -MAIL_DIR/cur/28:2, -MAIL_DIR/cur/27:2, -MAIL_DIR/cur/26:2, -MAIL_DIR/cur/25:2, -MAIL_DIR/cur/24:2, -MAIL_DIR/cur/23:2, -MAIL_DIR/cur/22:2, -MAIL_DIR/cur/21:2, -MAIL_DIR/cur/19:2, -MAIL_DIR/cur/18:2, -MAIL_DIR/cur/20:2, -MAIL_DIR/cur/17:2, -MAIL_DIR/cur/16:2, -MAIL_DIR/cur/15:2, -MAIL_DIR/cur/14:2, -MAIL_DIR/cur/13:2, -MAIL_DIR/cur/12:2, -MAIL_DIR/cur/11:2, -MAIL_DIR/cur/10:2, -MAIL_DIR/cur/09:2, -MAIL_DIR/cur/08:2, -MAIL_DIR/cur/06:2, -MAIL_DIR/cur/05:2, -MAIL_DIR/cur/04:2, -MAIL_DIR/cur/03:2, -MAIL_DIR/cur/07:2, -MAIL_DIR/cur/02:2, -MAIL_DIR/cur/01:2, +MAIL_DIR/bar/baz/new/28:2, +MAIL_DIR/bar/baz/new/27:2, +MAIL_DIR/bar/baz/cur/26:2, +MAIL_DIR/bar/baz/cur/25:2, +MAIL_DIR/bar/baz/24:2, +MAIL_DIR/bar/baz/23:2, +MAIL_DIR/bar/new/22:2, +MAIL_DIR/bar/new/21:2, +MAIL_DIR/bar/cur/19:2, +MAIL_DIR/bar/cur/20:2, +MAIL_DIR/bar/17:2, +MAIL_DIR/foo/baz/new/16:2, +MAIL_DIR/foo/baz/new/15:2, +MAIL_DIR/foo/baz/cur/14:2, +MAIL_DIR/foo/baz/cur/13:2, +MAIL_DIR/foo/baz/12:2, +MAIL_DIR/foo/baz/11:2, +MAIL_DIR/foo/new/10:2, +MAIL_DIR/foo/new/09:2, +MAIL_DIR/foo/cur/08:2, +MAIL_DIR/foo/06:2, +MAIL_DIR/bar/baz/05:2, +MAIL_DIR/new/04:2, +MAIL_DIR/foo/new/03:2, +MAIL_DIR/foo/cur/07:2, +MAIL_DIR/02:2, +MAIL_DIR/01:2, EOF test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "--output=files --format=json" -notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize >OUTPUT -cat <<EOF >EXPECTED +notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize \ + | test_sort_json >OUTPUT +cat <<EOF | test_sort_json >EXPECTED ["MAIL_DIR/cur/52:2,", "MAIL_DIR/cur/53:2,", "MAIL_DIR/cur/50:2,", @@ -324,42 +328,42 @@ cat <<EOF >EXPECTED "MAIL_DIR/cur/31:2,", "MAIL_DIR/cur/30:2,", "MAIL_DIR/cur/29:2,", -"MAIL_DIR/cur/28:2,", -"MAIL_DIR/cur/27:2,", -"MAIL_DIR/cur/26:2,", -"MAIL_DIR/cur/25:2,", -"MAIL_DIR/cur/24:2,", -"MAIL_DIR/cur/23:2,", -"MAIL_DIR/cur/22:2,", -"MAIL_DIR/cur/21:2,", -"MAIL_DIR/cur/19:2,", -"MAIL_DIR/cur/18:2,", +"MAIL_DIR/bar/baz/new/28:2,", +"MAIL_DIR/bar/baz/new/27:2,", +"MAIL_DIR/bar/baz/cur/26:2,", +"MAIL_DIR/bar/baz/cur/25:2,", +"MAIL_DIR/bar/baz/24:2,", +"MAIL_DIR/bar/baz/23:2,", +"MAIL_DIR/bar/new/22:2,", +"MAIL_DIR/bar/new/21:2,", +"MAIL_DIR/bar/cur/19:2,", +"MAIL_DIR/bar/18:2,", "MAIL_DIR/cur/51:2,", -"MAIL_DIR/cur/20:2,", -"MAIL_DIR/cur/17:2,", -"MAIL_DIR/cur/16:2,", -"MAIL_DIR/cur/15:2,", -"MAIL_DIR/cur/14:2,", -"MAIL_DIR/cur/13:2,", -"MAIL_DIR/cur/12:2,", -"MAIL_DIR/cur/11:2,", -"MAIL_DIR/cur/10:2,", -"MAIL_DIR/cur/09:2,", -"MAIL_DIR/cur/08:2,", -"MAIL_DIR/cur/06:2,", -"MAIL_DIR/cur/05:2,", -"MAIL_DIR/cur/04:2,", -"MAIL_DIR/cur/03:2,", -"MAIL_DIR/cur/07:2,", -"MAIL_DIR/cur/02:2,", -"MAIL_DIR/cur/01:2,"] +"MAIL_DIR/bar/cur/20:2,", +"MAIL_DIR/bar/17:2,", +"MAIL_DIR/foo/baz/new/16:2,", +"MAIL_DIR/foo/baz/new/15:2,", +"MAIL_DIR/foo/baz/cur/14:2,", +"MAIL_DIR/foo/baz/cur/13:2,", +"MAIL_DIR/foo/baz/12:2,", +"MAIL_DIR/foo/baz/11:2,", +"MAIL_DIR/foo/new/10:2,", +"MAIL_DIR/foo/new/09:2,", +"MAIL_DIR/foo/cur/08:2,", +"MAIL_DIR/foo/06:2,", +"MAIL_DIR/bar/baz/05:2,", +"MAIL_DIR/new/04:2,", +"MAIL_DIR/foo/new/03:2,", +"MAIL_DIR/foo/cur/07:2,", +"MAIL_DIR/02:2,", +"MAIL_DIR/01:2,"] EOF test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "--output=files --format=json --duplicate=2" notmuch search --format=json --output=files --duplicate=2 '*' | notmuch_search_files_sanitize >OUTPUT cat <<EOF >EXPECTED -["MAIL_DIR/cur/51:2,"] +["$dup2"] EOF test_expect_equal_file OUTPUT EXPECTED diff --git a/test/corpus/cur/01:2, b/test/corpus/01:2, index 7e9e3490..7e9e3490 100644 --- a/test/corpus/cur/01:2, +++ b/test/corpus/01:2, diff --git a/test/corpus/cur/02:2, b/test/corpus/02:2, index dadcdaac..dadcdaac 100644 --- a/test/corpus/cur/02:2, +++ b/test/corpus/02:2, diff --git a/test/corpus/cur/17:2, b/test/corpus/bar/17:2, index d3b75685..d3b75685 100644 --- a/test/corpus/cur/17:2, +++ b/test/corpus/bar/17:2, diff --git a/test/corpus/cur/18:2, b/test/corpus/bar/18:2, index f522f69e..f522f69e 100644 --- a/test/corpus/cur/18:2, +++ b/test/corpus/bar/18:2, diff --git a/test/corpus/cur/05:2, b/test/corpus/bar/baz/05:2, index 75b05fa4..75b05fa4 100644 --- a/test/corpus/cur/05:2, +++ b/test/corpus/bar/baz/05:2, diff --git a/test/corpus/cur/23:2, b/test/corpus/bar/baz/23:2, index 9bb62d73..9bb62d73 100644 --- a/test/corpus/cur/23:2, +++ b/test/corpus/bar/baz/23:2, diff --git a/test/corpus/cur/24:2, b/test/corpus/bar/baz/24:2, index c8000207..c8000207 100644 --- a/test/corpus/cur/24:2, +++ b/test/corpus/bar/baz/24:2, diff --git a/test/corpus/cur/25:2, b/test/corpus/bar/baz/cur/25:2, index 7378f820..7378f820 100644 --- a/test/corpus/cur/25:2, +++ b/test/corpus/bar/baz/cur/25:2, diff --git a/test/corpus/cur/26:2, b/test/corpus/bar/baz/cur/26:2, index f3c5f53d..f3c5f53d 100644 --- a/test/corpus/cur/26:2, +++ b/test/corpus/bar/baz/cur/26:2, diff --git a/test/corpus/cur/27:2, b/test/corpus/bar/baz/new/27:2, index 7f0f045b..7f0f045b 100644 --- a/test/corpus/cur/27:2, +++ b/test/corpus/bar/baz/new/27:2, diff --git a/test/corpus/cur/28:2, b/test/corpus/bar/baz/new/28:2, index 83ce01bd..83ce01bd 100644 --- a/test/corpus/cur/28:2, +++ b/test/corpus/bar/baz/new/28:2, diff --git a/test/corpus/cur/19:2, b/test/corpus/bar/cur/19:2, index 1b7872b0..1b7872b0 100644 --- a/test/corpus/cur/19:2, +++ b/test/corpus/bar/cur/19:2, diff --git a/test/corpus/cur/20:2, b/test/corpus/bar/cur/20:2, index f08a3145..f08a3145 100644 --- a/test/corpus/cur/20:2, +++ b/test/corpus/bar/cur/20:2, diff --git a/test/corpus/cur/21:2, b/test/corpus/bar/new/21:2, index 7ff55ccf..7ff55ccf 100644 --- a/test/corpus/cur/21:2, +++ b/test/corpus/bar/new/21:2, diff --git a/test/corpus/cur/22:2, b/test/corpus/bar/new/22:2, index 08adada6..08adada6 100644 --- a/test/corpus/cur/22:2, +++ b/test/corpus/bar/new/22:2, diff --git a/test/corpus/cur/06:2, b/test/corpus/foo/06:2, index 3baad491..3baad491 100644 --- a/test/corpus/cur/06:2, +++ b/test/corpus/foo/06:2, diff --git a/test/corpus/cur/11:2, b/test/corpus/foo/baz/11:2, index c0701def..c0701def 100644 --- a/test/corpus/cur/11:2, +++ b/test/corpus/foo/baz/11:2, diff --git a/test/corpus/cur/12:2, b/test/corpus/foo/baz/12:2, index fbc604c0..fbc604c0 100644 --- a/test/corpus/cur/12:2, +++ b/test/corpus/foo/baz/12:2, diff --git a/test/corpus/cur/13:2, b/test/corpus/foo/baz/cur/13:2, index 03cb3744..03cb3744 100644 --- a/test/corpus/cur/13:2, +++ b/test/corpus/foo/baz/cur/13:2, diff --git a/test/corpus/cur/14:2, b/test/corpus/foo/baz/cur/14:2, index d3fe78db..d3fe78db 100644 --- a/test/corpus/cur/14:2, +++ b/test/corpus/foo/baz/cur/14:2, diff --git a/test/corpus/cur/15:2, b/test/corpus/foo/baz/new/15:2, index 6824d5ea..6824d5ea 100644 --- a/test/corpus/cur/15:2, +++ b/test/corpus/foo/baz/new/15:2, diff --git a/test/corpus/cur/16:2, b/test/corpus/foo/baz/new/16:2, index f531eb93..f531eb93 100644 --- a/test/corpus/cur/16:2, +++ b/test/corpus/foo/baz/new/16:2, diff --git a/test/corpus/cur/07:2, b/test/corpus/foo/cur/07:2, index 7b1e2bbe..7b1e2bbe 100644 --- a/test/corpus/cur/07:2, +++ b/test/corpus/foo/cur/07:2, diff --git a/test/corpus/cur/08:2, b/test/corpus/foo/cur/08:2, index baf34d1f..baf34d1f 100644 --- a/test/corpus/cur/08:2, +++ b/test/corpus/foo/cur/08:2, diff --git a/test/corpus/cur/03:2, b/test/corpus/foo/new/03:2, index c154ac5e..c154ac5e 100644 --- a/test/corpus/cur/03:2, +++ b/test/corpus/foo/new/03:2, diff --git a/test/corpus/cur/09:2, b/test/corpus/foo/new/09:2, index 26b51b1f..26b51b1f 100644 --- a/test/corpus/cur/09:2, +++ b/test/corpus/foo/new/09:2, diff --git a/test/corpus/cur/10:2, b/test/corpus/foo/new/10:2, index 4211d734..4211d734 100644 --- a/test/corpus/cur/10:2, +++ b/test/corpus/foo/new/10:2, diff --git a/test/corpus/cur/04:2, b/test/corpus/new/04:2, index 0ce678bf..0ce678bf 100644 --- a/test/corpus/cur/04:2, +++ b/test/corpus/new/04:2, |