X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2Fdump-restore;h=e7edd9b2573df7fc43e8a2565513c341202e4579;hb=09beff1def1daa9887679723205855ff7da8a297;hp=a4de3706c510d23fe033cd69b5d5c0bf12155343;hpb=3fa843216c918fe4a6151e55947cf3a7f46fcdb5;p=notmuch

diff --git a/test/dump-restore b/test/dump-restore
index a4de3706..e7edd9b2 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -6,17 +6,42 @@ add_email_corpus
 
 test_expect_success "Dumping all tags" "generate_message &&
 notmuch new &&
-notmuch dump dump.expected"
+notmuch dump > dump.expected"
+
+test_begin_subtest "dump outfile"
+notmuch dump dump-outfile.actual
+test_expect_equal_file dump.expected dump-outfile.actual
+
+test_begin_subtest "dump outfile --"
+notmuch dump dump-1-arg-dash.actual --
+test_expect_equal_file dump.expected dump-1-arg-dash.actual
+
+# Note, we assume all messages from cworth have a message-id
+# containing cworth.org
+
+grep cworth\.org dump.expected > dump-cworth.expected
+
+test_begin_subtest "dump -- from:cworth"
+notmuch dump -- from:cworth > dump-dash-cworth.actual
+test_expect_equal_file dump-cworth.expected dump-dash-cworth.actual
+
+test_begin_subtest "dump outfile from:cworth"
+notmuch dump dump-outfile-cworth.actual from:cworth
+test_expect_equal_file dump-cworth.expected dump-outfile-cworth.actual
+
+test_begin_subtest "dump outfile -- from:cworth"
+notmuch dump dump-outfile-dash-inbox.actual -- from:cworth
+test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual
 
 test_begin_subtest "Clearing all tags"
 sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected
-notmuch restore clear.expected
-notmuch dump clear.actual
+notmuch restore < clear.expected
+notmuch dump > clear.actual
 test_expect_equal "$(< clear.actual)" "$(< clear.expected)"
 
 test_begin_subtest "Restoring original tags"
-notmuch restore dump.expected
-notmuch dump dump.actual
+notmuch restore < dump.expected
+notmuch dump > dump.actual
 test_expect_equal "$(< dump.actual)" "$(< dump.expected)"
 
 test_expect_success "Restore with nothing to do" "notmuch restore dump.expected"