From: Austin Clements Date: Mon, 21 Apr 2014 19:58:11 +0000 (+2000) Subject: [PATCH v2] test: Test thread linking in all possible delivery orders X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe8a6c7fdc66386d2d4d211d29df237f6573f0b8;p=notmuch-archives.git [PATCH v2] test: Test thread linking in all possible delivery orders --- diff --git a/bc/402528f83731c4da9dd3c5bfa0759fe4f27372 b/bc/402528f83731c4da9dd3c5bfa0759fe4f27372 new file mode 100644 index 000000000..a7e6e4b58 --- /dev/null +++ b/bc/402528f83731c4da9dd3c5bfa0759fe4f27372 @@ -0,0 +1,200 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 9EBBA431FBD + for ; Mon, 21 Apr 2014 12:58:32 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id MLONvpHhLFhR for ; + Mon, 21 Apr 2014 12:58:26 -0700 (PDT) +Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu + [18.9.25.12]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 88E8B431FBC + for ; Mon, 21 Apr 2014 12:58:26 -0700 (PDT) +X-AuditID: 1209190c-f794a6d000000c27-fa-53557861ec90 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP + id 2C.8E.03111.16875535; Mon, 21 Apr 2014 15:58:25 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s3LJwKeu029665; + Mon, 21 Apr 2014 15:58:21 -0400 +Received: from drake.dyndns.org + (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [216.15.114.40]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s3LJwIfg023311 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Mon, 21 Apr 2014 15:58:20 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1WcKM6-0004AH-LS; Mon, 21 Apr 2014 15:58:18 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2] test: Test thread linking in all possible delivery orders +Date: Mon, 21 Apr 2014 15:58:11 -0400 +Message-Id: <1398110291-15832-1-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.9.1 +In-Reply-To: <87y4zhfmrn.fsf@maritornes.cs.unb.ca> +References: <87y4zhfmrn.fsf@maritornes.cs.unb.ca> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6nrptYERps8PiWssWN1m5Gi9VzeSyu + 35zJ7MDssXPWXXaPZ6tuMXtsOfSeOYA5issmJTUnsyy1SN8ugSvj5e4upoIrShXfzn9kaWB8 + LtXFyMkhIWAicXL7d3YIW0ziwr31bF2MXBxCArOZJGY2/GeCcDYySlzoncQM4dxhkjj+/BFU + Zi6jRP/jm8wg/WwCGhLb9i9nBLFFBKQldt6dzQpiMwvESjS+XQZWIyzgK/FlYScbiM0ioCqx + 7OgXMJtXwEFi782LTBB3yEmcPDYZrJdTwEhiz5LrYL1CAoYS314dZpvAyL+AkWEVo2xKbpVu + bmJmTnFqsm5xcmJeXmqRrqFebmaJXmpK6SZGUHhxSvLsYHxzUOkQowAHoxIPr4RBaLAQa2JZ + cWXuIUZJDiYlUV6BEqAQX1J+SmVGYnFGfFFpTmrxIUYJDmYlEd61aUA53pTEyqrUonyYlDQH + i5I471trq2AhgfTEktTs1NSC1CKYrAwHh5IEL3M5UKNgUWp6akVaZk4JQpqJgxNkOA/Q8Moy + kOHFBYm5xZnpEPlTjIpS4rwXQRICIImM0jy4Xlj8v2IUB3pFmPc2SBUPMHXAdb8CGswENPjJ + lhCQwSWJCCmpBkYW3V2/Vk/79Mzdeql+bf41d4HVHrIrMjKC3xcezTzGyNg9d7LghZ02Gjy/ + ZzfxH7I6/mCFeUPgk/i0SS7bN3m357953OAkulHa/E7Fvg1f9Nq00q04H7gbPPvwq1V7+7ss + l8JA9dnNQtOnfdscqfbu9qLMUnE33Zh60+2Bx/Zv3d+qHL8k7oQSS3FGoqEWc1FxIgD4fHqu + 2gIAAA== +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 21 Apr 2014 19:58:32 -0000 + +These tests deliver all possible (single-root) four-message threads in +all possible orders and check that notmuch successfully links them +into threads. + +There are two variants of the test: one delivers messages that +reference only their immediate parent and the other delivers messages +that reference all of their parents. The latter test is currently +known-broken. + +This is introduced as a new test (rather than just adding it to +T050-new) because it's much easier for this to start with an empty +database. +--- + +This version hopefully addresses David's comments in +id:87y4zhfmrn.fsf@maritornes.cs.unb.ca and adds a second test that +demonstrates the bug Mark in figured out in +id:8738h7kv2q.fsf@qmul.ac.uk. + +test/T051-new-linking.sh | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 91 insertions(+) + create mode 100755 test/T051-new-linking.sh + +diff --git a/test/T051-new-linking.sh b/test/T051-new-linking.sh +new file mode 100755 +index 0000000..9ccbc52 +--- /dev/null ++++ b/test/T051-new-linking.sh +@@ -0,0 +1,91 @@ ++#!/usr/bin/env bash ++test_description='"notmuch new" thread linking' ++ ++. ./test-lib.sh ++ ++# Generate all possible single-root four message thread structures. ++# Each line in THREADS is a thread structure, where the n'th field is ++# the parent of message n. We'll use this for multiple tests below. ++THREADS=$(python -c ' ++def mkTrees(free, tree={}): ++ if free == set(): ++ print(" ".join(map(str, [msg[1] for msg in sorted(tree.items())]))) ++ return ++ # Attach each free message to each message in the tree (if there is ++ # no tree, make the free message the root), backtracking after each ++ for msg in sorted(free): ++ parents = sorted(tree.keys()) if tree else ["none"] ++ for parent in parents: ++ ntree = tree.copy() ++ ntree[msg] = parent ++ mkTrees(free - set([msg]), ntree) ++mkTrees(set(range(4)))') ++nthreads=$(wc -l <<< "$THREADS") ++ ++test_begin_subtest "All four-message threads get linked in all delivery orders (one parent)" ++# In the first variant, this delivers messages that reference only ++# their immediate parent. Hence, we should only expect threads to be ++# fully joined at the end. ++for ((n = 0; n < 4; n++)); do ++ # Deliver the n'th message of every thread ++ thread=0 ++ while read -a parents; do ++ parent=${parents[$n]} ++ generate_message \ ++ [id]=m$n@t$thread [in-reply-to]="\" \ ++ [subject]=p$thread [from]=m$n ++ thread=$((thread + 1)) ++ done <<< "$THREADS" ++ notmuch new > /dev/null ++done ++output=$(notmuch search --sort=newest-first '*' | notmuch_search_sanitize) ++expected=$(for ((i = 0; i < $nthreads; i++)); do ++ echo "thread:XXX 2001-01-05 [4/4] m3, m2, m1, m0; p$i (inbox unread)" ++ done) ++test_expect_equal "$output" "$expected" ++ ++test_begin_subtest "The same (full parent linkage)" ++test_subtest_known_broken ++# Here we do the same thing as the previous test, but each message ++# references all of its parents. Since every message references the ++# root of the thread, each thread should always be fully joined. This ++# is currently broken because of the bug detailed in ++# id:8738h7kv2q.fsf@qmul.ac.uk. ++rm ${MAIL_DIR}/* ++notmuch new ++output="" ++expected="" ++for ((n = 0; n < 4; n++)); do ++ # Deliver the n'th message of every thread ++ thread=0 ++ while read -a parents; do ++ references="" ++ parent=${parents[$n]} ++ while [[ $parent != none ]]; do ++ references=" $references" ++ parent=${parents[$parent]} ++ done ++ ++ generate_message \ ++ [id]=m$n@t$thread [references]="'$references'" \ ++ [subject]=p$thread [from]=m$n ++ thread=$((thread + 1)) ++ done <<< "$THREADS" ++ notmuch new > /dev/null ++ ++ output="$output ++$(notmuch search --sort=newest-first '*' | notmuch_search_sanitize)" ++ ++ # Construct expected output ++ template="thread:XXX 2001-01-05 [$((n+1))/$((n+1))]" ++ for ((m = n; m > 0; m--)); do ++ template="$template m$m," ++ done ++ expected="$expected ++$(for ((i = 0; i < $nthreads; i++)); do ++ echo "$template m0; p$i (inbox unread)" ++ done)" ++done ++test_expect_equal "$output" "$expected" ++ ++test_done +-- +1.9.1 +