On Tue, Oct 29 2013, Ben Gamari <bgamari.foss@gmail.com> wrote: > Signed-off-by: Ben Gamari <bgamari.foss@gmail.com> > --- Patches 2, 3 & 4 Looks OK To Me. Thanks. A few comments on this patch inline: > test/compact | 35 +++++++++++++++++++++++++++++++++++ > test/notmuch-test | 1 + > 2 files changed, 36 insertions(+) > create mode 100755 test/compact > > diff --git a/test/compact b/test/compact > new file mode 100755 > index 0000000..54e85ab > --- /dev/null > +++ b/test/compact > @@ -0,0 +1,35 @@ > +#!/usr/bin/env bash > +test_description='"notmuch compact"' > +. ./test-lib.sh > + > +add_message '[subject]=One' > +add_message '[subject]=Two' > +add_message '[subject]=Three' > + > +notmuch tag +tag1 \* > +notmuch tag +tag2 subject:Two > +notmuch tag -tag1 +tag3 subject:Three > + > +test_begin_subtest "Compacting" > +notmuch compact > +test_expect_success "compact" "notmuch compact" test_expect_success executes "$2" ("notmuch compact" in this case) do you mean to run notmuch 'compact twice' ? > +notmuch search \* > +output=$(notmuch search \* | notmuch_search_sanitize) Now do you mean to run 'notmuch search \*' twice ? > +test_expect_equal "$output" "\ > +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread) > +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread) > +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)" > + > +test_begin_subtest "Restoring backup" > +rm -Rf ${TEST_TMPDIR}/mail/xapian > +mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian > + > +notmuch search \* > +output=$(notmuch search \* | notmuch_search_sanitize) again... ? ... actually David Bremner had even more insightful comments in id:874n8cw2yq.fsf@zancas.localnet to these same issues :D Tomi > +test_expect_equal "$output" "\ > +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread) > +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread) > +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)" > + > +test_done > diff --git a/test/notmuch-test b/test/notmuch-test > index aa28bb0..ec94baf 100755 > --- a/test/notmuch-test > +++ b/test/notmuch-test > @@ -19,6 +19,7 @@ cd $(dirname "$0") > TESTS=" > basic > help-test > + compact > config > setup > new > -- > 1.8.3.2 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch