aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Bremner <bremner@debian.org>2012-08-04 09:55:45 -0300
committerDavid Bremner <bremner@debian.org>2012-08-06 08:52:45 -0300
commit19c824c3fd7be29a2257cdd530ee23074c978d63 (patch)
treee40c6eddaffc3bf20646572f1802bfa068d87fdc /test
parent760e17488e6b11299f2971cf879b109b84816d14 (diff)
notmuch-restore: replace positional argument for input with option
Since notmuch dump doesn't use positional arguments anymore, it seems better to be consistent.
Diffstat (limited to 'test')
-rwxr-xr-xtest/dump-restore8
-rwxr-xr-xtest/maildir-sync2
2 files changed, 5 insertions, 5 deletions
diff --git a/test/dump-restore b/test/dump-restore
index c7801cf..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,7 +51,7 @@ 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 --output=outfile"
notmuch dump --output=dump-outfile.actual
diff --git a/test/maildir-sync b/test/maildir-sync
index 0914fa5..0fc742a 100755
--- a/test/maildir-sync
+++ b/test/maildir-sync
@@ -126,7 +126,7 @@ mv $MAIL_DIR/cur/adding-with-s-flag:2,S $MAIL_DIR/cur/adding-with-s-flag:2,RS
mv $MAIL_DIR/cur/message-to-move-to-cur:2,S $MAIL_DIR/cur/message-to-move-to-cur:2,DS
notmuch dump --output=dump.txt
NOTMUCH_NEW >/dev/null
-notmuch restore dump.txt
+notmuch restore --input=dump.txt
output=$(ls $MAIL_DIR/cur)
test_expect_equal "$output" "$expected"