X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fdump-restore;fp=test%2Fdump-restore;h=c7801cfc000d9c723e7a07f115be22eb5e9cd226;hp=439e99808af5721c0042e4e9b7ede85cb0b9170a;hb=760e17488e6b11299f2971cf879b109b84816d14;hpb=ddb009519d24ca6cae64608f2d4a93ca6e78d80a diff --git a/test/dump-restore b/test/dump-restore index 439e9980..c7801cfc 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -53,16 +53,12 @@ test_expect_success 'Restore with nothing to do, III' \ test_expect_success 'Invalid restore invocation' \ 'test_must_fail notmuch restore 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