* [PATCH 1/4] test: Add compact test
[not found] <id:m24n80qqy2.fsf@guru.guru-group.fi>
@ 2013-10-31 4:10 ` Ben Gamari
2013-10-31 7:48 ` Tomi Ollila
2013-10-31 10:56 ` David Bremner
0 siblings, 2 replies; 6+ messages in thread
From: Ben Gamari @ 2013-10-31 4:10 UTC (permalink / raw)
To: notmuch
Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
---
test/compact | 32 ++++++++++++++++++++++++++++++++
test/notmuch-test | 1 +
2 files changed, 33 insertions(+)
create mode 100755 test/compact
diff --git a/test/compact b/test/compact
new file mode 100755
index 0000000..5bb5cea
--- /dev/null
+++ b/test/compact
@@ -0,0 +1,32 @@
+#!/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_expect_success "Running compact" "notmuch compact"
+
+test_begin_subtest "Compact preserves database"
+output=$(notmuch search \* | notmuch_search_sanitize)
+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
+
+output=$(notmuch search \* | notmuch_search_sanitize)
+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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] test: Add compact test
2013-10-31 4:10 ` [PATCH 1/4] test: Add compact test Ben Gamari
@ 2013-10-31 7:48 ` Tomi Ollila
2013-10-31 10:56 ` David Bremner
1 sibling, 0 replies; 6+ messages in thread
From: Tomi Ollila @ 2013-10-31 7:48 UTC (permalink / raw)
To: Ben Gamari, notmuch
On Thu, Oct 31 2013, Ben Gamari <bgamari.foss@gmail.com> wrote:
> Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
LGTM.
Tomi
> ---
> test/compact | 32 ++++++++++++++++++++++++++++++++
> test/notmuch-test | 1 +
> 2 files changed, 33 insertions(+)
> create mode 100755 test/compact
>
> diff --git a/test/compact b/test/compact
> new file mode 100755
> index 0000000..5bb5cea
> --- /dev/null
> +++ b/test/compact
> @@ -0,0 +1,32 @@
> +#!/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_expect_success "Running compact" "notmuch compact"
> +
> +test_begin_subtest "Compact preserves database"
> +output=$(notmuch search \* | notmuch_search_sanitize)
> +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
> +
> +output=$(notmuch search \* | notmuch_search_sanitize)
> +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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] test: Add compact test
2013-10-31 4:10 ` [PATCH 1/4] test: Add compact test Ben Gamari
2013-10-31 7:48 ` Tomi Ollila
@ 2013-10-31 10:56 ` David Bremner
1 sibling, 0 replies; 6+ messages in thread
From: David Bremner @ 2013-10-31 10:56 UTC (permalink / raw)
To: Ben Gamari, notmuch
Ben Gamari <bgamari.foss@gmail.com> writes:
> Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
> ---
> test/compact | 32 ++++++++++++++++++++++++++++++++
> test/notmuch-test | 1 +
Pushed the tests.
d
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] test: Add compact test
@ 2013-10-28 22:23 Ben Gamari
2013-10-29 11:03 ` Tomi Ollila
0 siblings, 1 reply; 6+ messages in thread
From: Ben Gamari @ 2013-10-28 22:23 UTC (permalink / raw)
To: notmuch
Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
---
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"
+
+notmuch search \*
+output=$(notmuch search \* | notmuch_search_sanitize)
+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)
+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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] test: Add compact test
2013-10-28 22:23 Ben Gamari
@ 2013-10-29 11:03 ` Tomi Ollila
2013-10-31 4:10 ` Ben Gamari
0 siblings, 1 reply; 6+ messages in thread
From: Tomi Ollila @ 2013-10-29 11:03 UTC (permalink / raw)
To: Ben Gamari, notmuch
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] test: Add compact test
2013-10-29 11:03 ` Tomi Ollila
@ 2013-10-31 4:10 ` Ben Gamari
0 siblings, 0 replies; 6+ messages in thread
From: Ben Gamari @ 2013-10-31 4:10 UTC (permalink / raw)
To: Tomi Ollila, notmuch
[-- Attachment #1: Type: text/plain, Size: 2242 bytes --]
Tomi Ollila <tomi.ollila@iki.fi> writes:
> 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:
>
Thanks again for the review!
>> 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' ?
>
It's been a while but I suspect I just never cleaned up the patch after
coming to this realization. Anyways, it's fixed in the revised patch
coming shortly.
>> +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
>
Hmm, it seems I overlooked these. Thanks for the reference.
Cheers,
- Ben
[-- Attachment #2: Type: application/pgp-signature, Size: 489 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-31 10:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <id:m24n80qqy2.fsf@guru.guru-group.fi>
2013-10-31 4:10 ` [PATCH 1/4] test: Add compact test Ben Gamari
2013-10-31 7:48 ` Tomi Ollila
2013-10-31 10:56 ` David Bremner
2013-10-28 22:23 Ben Gamari
2013-10-29 11:03 ` Tomi Ollila
2013-10-31 4:10 ` Ben Gamari
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).