diff options
Diffstat (limited to 'test/dump-restore')
| -rwxr-xr-x | test/dump-restore | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/test/dump-restore b/test/dump-restore index 439e998..f25f7cf 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -19,7 +19,7 @@ test_expect_success 'Dumping all tags II' \ test_expect_success 'Clearing all tags' \ 'sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected && - notmuch restore clear.expected && + notmuch restore --input=clear.expected && notmuch dump > clear.actual && test_cmp clear.expected clear.actual' @@ -30,7 +30,7 @@ test_expect_success 'Accumulate original tags' \ test_cmp dump-ABC_DEF.expected dump.actual' test_expect_success 'Restoring original tags' \ - 'notmuch restore dump.expected && + 'notmuch restore --input=dump.expected && notmuch dump > dump.actual && test_cmp dump.expected dump.actual' @@ -40,7 +40,7 @@ test_expect_success 'Restore with nothing to do' \ test_cmp dump.expected dump.actual' test_expect_success 'Restore with nothing to do, II' \ - 'notmuch restore --accumulate dump.expected && + 'notmuch restore --accumulate --input=dump.expected && notmuch dump > dump.actual && test_cmp dump.expected dump.actual' @@ -51,18 +51,14 @@ test_expect_success 'Restore with nothing to do, III' \ # notmuch restore currently only considers the first argument. test_expect_success 'Invalid restore invocation' \ - 'test_must_fail notmuch restore dump.expected another_one' + 'test_must_fail notmuch restore --input=dump.expected another_one' -test_begin_subtest "dump outfile" -notmuch dump dump-outfile.actual +test_begin_subtest "dump --output=outfile" +notmuch dump --output=dump-outfile.actual test_expect_equal_file dump.expected dump-outfile.actual -test_begin_subtest "dump outfile # deprecated" -test_expect_equal "Warning: the output file argument of dump is deprecated."\ - "$(notmuch dump /dev/null 2>&1)" - -test_begin_subtest "dump outfile --" -notmuch dump dump-1-arg-dash.actual -- +test_begin_subtest "dump --output=outfile --" +notmuch dump --output=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 @@ -74,12 +70,12 @@ 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_begin_subtest "dump --output=outfile from:cworth" +notmuch dump --output=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_begin_subtest "dump --output=outfile -- from:cworth" +notmuch dump --output=dump-outfile-dash-inbox.actual -- from:cworth test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual test_done |