From: David Bremner <bremner@debian.org>
Date: Fri, 16 Nov 2012 12:31:19 +0000 (-0400)
Subject: test: add nontrivial test for restore --accumulate.
X-Git-Tag: 0.15_rc1~167
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be66f3f70937454b367b01bdee0238e38fbf12fa;p=notmuch.git

test: add nontrivial test for restore --accumulate.

It seems we have never tested the case that restore --accumulate
actually adds tags. I noticed this when I started optimizing and no
tests failed.

The bracketing with "restore --input=dump.expected" are to make sure
we start in a known state, and we leave the database in a known state
for the next test.
---

diff --git a/test/dump-restore b/test/dump-restore
index 7acf7fe4..b05399ca 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -49,6 +49,13 @@ test_expect_success 'Accumulate with no tags' \
   notmuch dump > dump.actual &&
   test_cmp dump.expected dump.actual'
 
+test_expect_success 'Accumulate with new tags' \
+  'notmuch restore --input=dump.expected &&
+  notmuch restore --accumulate --input=dump-ABC_DEF.expected &&
+  notmuch dump >  OUTPUT.$test_count &&
+  notmuch restore --input=dump.expected &&
+  test_cmp dump-ABC_DEF.expected OUTPUT.$test_count'
+
 # notmuch restore currently only considers the first argument.
 test_expect_success 'Invalid restore invocation' \
   'test_must_fail notmuch restore --input=dump.expected another_one'