aboutsummaryrefslogtreecommitdiff
path: root/test/dump-restore
diff options
context:
space:
mode:
authorDavid Bremner <bremner@debian.org>2011-10-19 18:18:24 -0300
committerDavid Bremner <bremner@debian.org>2011-10-23 10:27:57 -0300
commita77d9adcacf001025092087fb6c1d77743cdf699 (patch)
tree1aefc7985d08b1cd9f05fa09859bab667c12bcf0 /test/dump-restore
parent42c80dfd07740ed07cf58eefd0c30dc78cbafc08 (diff)
notmuch-restore: implement --accumulate option
Modify command line argument handling to take a --accumulate flag. Test for extra arguments beyond the input file. The --accumulate switch causes the union of the existing and new tags to be applied, instead of replacing each message's tags as they are read in from the dump file. Based on a patch by Thomas Schwinge: id:"1317317857-29636-1-git-send-email-thomas@schwinge.name"
Diffstat (limited to 'test/dump-restore')
-rwxr-xr-xtest/dump-restore3
1 files changed, 0 insertions, 3 deletions
diff --git a/test/dump-restore b/test/dump-restore
index 0f62d9d..8509671 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -23,7 +23,6 @@ test_expect_success 'Clearing all tags' \
notmuch dump > clear.actual &&
test_cmp clear.expected clear.actual'
-test_subtest_known_broken # missing --accumuluate
test_expect_success 'Accumulate original tags' \
'notmuch tag +ABC +DEF -- from:cworth &&
notmuch restore --accumulate < dump.expected &&
@@ -40,13 +39,11 @@ test_expect_success 'Restore with nothing to do' \
notmuch dump > dump.actual &&
test_cmp dump.expected dump.actual'
-test_subtest_known_broken # missing --accumuluate
test_expect_success 'Restore with nothing to do, II' \
'notmuch restore --accumulate dump.expected &&
notmuch dump > dump.actual &&
test_cmp dump.expected dump.actual'
-test_subtest_known_broken # missing --accumuluate
test_expect_success 'Restore with nothing to do, III' \
'notmuch restore --accumulate < clear.expected &&
notmuch dump > dump.actual &&