From: Austin Clements Date: Tue, 22 Apr 2014 22:11:15 +0000 (+2000) Subject: Re: [PATCH v2] test: Test thread linking in all possible delivery orders X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba9873bdf6a02315813e8c732d8ea244d0f4b8c3;p=notmuch-archives.git Re: [PATCH v2] test: Test thread linking in all possible delivery orders --- diff --git a/42/009ed64c3708bed51d59298334426113c7c94c b/42/009ed64c3708bed51d59298334426113c7c94c new file mode 100644 index 000000000..ce9de9b27 --- /dev/null +++ b/42/009ed64c3708bed51d59298334426113c7c94c @@ -0,0 +1,227 @@ +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 16FC2431FBF + for ; Tue, 22 Apr 2014 15:11:28 -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 aNtJlpsaqTVU for ; + Tue, 22 Apr 2014 15:11:20 -0700 (PDT) +Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu + [18.7.68.36]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 7BAF5431FBD + for ; Tue, 22 Apr 2014 15:11:20 -0700 (PDT) +X-AuditID: 12074424-f79e26d000000c70-85-5356e90777b0 +Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP + id E7.DA.03184.709E6535; Tue, 22 Apr 2014 18:11:19 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s3MMBHKP024357; + Tue, 22 Apr 2014 18:11:18 -0400 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s3MMBFnZ001951 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); + Tue, 22 Apr 2014 18:11:16 -0400 +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80) + (envelope-from ) + id 1WciuJ-0003bH-9t; Tue, 22 Apr 2014 18:11:15 -0400 +Date: Tue, 22 Apr 2014 18:11:15 -0400 +From: Austin Clements +To: Mark Walters +Subject: Re: [PATCH v2] test: Test thread linking in all possible delivery + orders +Message-ID: <20140422221115.GH25817@mit.edu> +References: <87y4zhfmrn.fsf@maritornes.cs.unb.ca> + <1398110291-15832-1-git-send-email-amdragon@mit.edu> + <87wqehaw69.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: <87wqehaw69.fsf@qmul.ac.uk> +User-Agent: Mutt/1.5.21 (2010-09-15) +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFupmleLIzCtJLcpLzFFi42IR4hTV1mV/GRZs8HKxmsWN1m5Gi9VzeSyu + 35zJ7MDssXPWXXaPZ6tuMXtsOfSeOYA5issmJTUnsyy1SN8ugSvj5+L0grk6FW+PXmBrYJyl + 2MXIySEhYCLx4tJdRghbTOLCvfVsXYxcHEICs5kkNh7/zArhbGSUOPX7ATuEc5pJYt2OLVDO + EkaJlRd2AfVwcLAIqEqcehUOMopNQENi2/7lYGNFBHQkbh9awA5iMwvoSbTPesYEUi4sECwx + 54kUSJgXqOTp7UaoZW2MEn09PYwQCUGJkzOfsED0aknc+PcSrJdZQFpi+T8OkDAn0Kp9n9Yw + g9iiAioSU05uY5vAKDQLSfcsJN2zELoXMDKvYpRNya3SzU3MzClOTdYtTk7My0st0jXXy80s + 0UtNKd3ECApzdheVHYzNh5QOMQpwMCrx8BauDAsWYk0sK67MPcQoycGkJMrr+wAoxJeUn1KZ + kVicEV9UmpNafIhRgoNZSYRXejVQjjclsbIqtSgfJiXNwaIkzvvW2ipYSCA9sSQ1OzW1ILUI + JivDwaEkwZv6AqhRsCg1PbUiLTOnBCHNxMEJMpwHaLg2SA1vcUFibnFmOkT+FKOilDhvNUhC + ACSRUZoH1wtLQ68YxYFeEeZNBqniAaYwuO5XQIOZgAY/2RICMrgkESEl1cCYENp+aP4nzTvr + vBmFqxlNztxeFioU03Fr29qt0y8w/ct4EmLufmq3kF365IDr702jFbLrMlK3Bmop/ur/l+HA + emrfzjUlW1QnHXdckvTnQttNsWnLTq68bGb6R/xzzyGnT2nn/3ZFFDPeFMpSmhJ/Ja9Cd+YV + +fCuz3dPf3BtDbpR+GjCtcR+JZbijERDLeai4kQAIAMk8B4DAAA= +Cc: notmuch@notmuchmail.org +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: Tue, 22 Apr 2014 22:11:28 -0000 + +The intent was to produce distinct trees, but obviously combinatorics +is not my strong suit. Any ideas how to fix/rewrite the algorithm, +other than just uniq'ing the output? + +Quoth Mark Walters on Apr 22 at 10:31 pm: +> +> Hi +> +> Broadly this looks good but I am somewhat confused by the python +> part. Is it intended to produce the same tree multiple times? It does +> seem to produce all the possible trees (*) so it doesn't matter but +> might be worth a comment. +> +> Best wishes +> +> Mark +> +> (*) I think there should be 64 rooted trees (16 trees and 4 possible +> roots) and the python generates 144 lines. Piping the output to sort and +> uniq gives 64 lines. +> +> +> +> On Mon, 21 Apr 2014, Austin Clements wrote: +> > 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