diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2016-04-08 22:54:48 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-04-15 07:07:23 -0300 |
| commit | 604d1e0977c2ede365f87492d6b9bf9a83c3e1d3 (patch) | |
| tree | 4b54122413b1d49543345366782256bdd3e531a6 /test | |
| parent | 92559ee3473381b0ba207ddb7db944d6ffadc2db (diff) | |
fix thread breakage via ghost-on-removal
implement ghost-on-removal, the solution to T590-thread-breakage.sh
that just adds a ghost message after removing each message.
It leaks information about whether we've ever seen a given message id,
but it's a fairly simple implementation.
Note that _resolve_message_id_to_thread_id already introduces new
message_ids to the database, so i think just searching for a given
message ID may introduce the same metadata leakage.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T590-thread-breakage.sh | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/test/T590-thread-breakage.sh b/test/T590-thread-breakage.sh index 2f838b39..4385c066 100755 --- a/test/T590-thread-breakage.sh +++ b/test/T590-thread-breakage.sh @@ -94,20 +94,11 @@ notmuch new >/dev/null test_thread_count 1 'First message removed: still only one thread' test_content_count apple 0 test_content_count banana 1 -test_begin_subtest 'should be one ghost after first message removed' -test_subtest_known_broken -ghosts=$(../ghost-report ${MAIL_DIR}/.notmuch/xapian) -test_expect_equal "$ghosts" "1" +test_ghost_count 1 'should be one ghost after first message removed' message_a notmuch new >/dev/null -# this is known to fail (it shows 2 threads) because no "ghost -# message" was created for message A when it was removed from the -# index, despite message B still pointing to it. -test_begin_subtest 'First message reappears: should return to the same thread' -test_subtest_known_broken -count=$(notmuch count --output=threads) -test_expect_equal "$count" "1" +test_thread_count 1 'First message reappears: should return to the same thread' test_content_count apple 1 test_content_count banana 1 test_ghost_count 0 @@ -117,13 +108,21 @@ notmuch new >/dev/null test_thread_count 1 'Removing second message: still only one thread' test_content_count apple 1 test_content_count banana 0 -test_ghost_count 0 'No ghosts should remain after deletion of second message' +test_begin_subtest 'No ghosts should remain after deletion of second message' +# this is known to fail; we are leaking ghost messages deliberately +test_subtest_known_broken +ghosts=$(../ghost-report ${MAIL_DIR}/.notmuch/xapian) +test_expect_equal "$ghosts" "0" rm -f ${MAIL_DIR}/cur/a notmuch new >/dev/null test_thread_count 0 'All messages gone: no threads' test_content_count apple 0 test_content_count banana 0 -test_ghost_count 0 +test_begin_subtest 'No ghosts should remain after full thread deletion' +# this is known to fail; we are leaking ghost messages deliberately +test_subtest_known_broken +ghosts=$(../ghost-report ${MAIL_DIR}/.notmuch/xapian) +test_expect_equal "$ghosts" "0" test_done |