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

diff --git a/test/dump-restore b/test/dump-restore
index 21f91055..e7edd9b2 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -1,22 +1,49 @@
-#!/bin/bash
+#!/usr/bin/env bash
 test_description="\"notmuch dump\" and \"notmuch restore\""
 . ./test-lib.sh
 
+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"
+test_expect_success "Restore with nothing to do" "notmuch restore dump.expected"
 
 test_done