From: Mark Walters Date: Tue, 22 Apr 2014 21:31:10 +0000 (+0100) Subject: Re: [PATCH v2] test: Test thread linking in all possible delivery orders X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=da487255bfcd4a7686dba7aa13771652f14f8ed4;p=notmuch-archives.git Re: [PATCH v2] test: Test thread linking in all possible delivery orders --- diff --git a/35/f7310bc3f822dc0240046fdbf214fc4231c16d b/35/f7310bc3f822dc0240046fdbf214fc4231c16d new file mode 100644 index 000000000..62d31d58a --- /dev/null +++ b/35/f7310bc3f822dc0240046fdbf214fc4231c16d @@ -0,0 +1,214 @@ +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 12E4A431FBF + for ; Tue, 22 Apr 2014 14:31:37 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.502 +X-Spam-Level: +X-Spam-Status: No, score=0.502 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, 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 lHBFgiZAz2me for ; + Tue, 22 Apr 2014 14:31:29 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D816C431FBD + for ; Tue, 22 Apr 2014 14:31:28 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1WciHf-0004dP-5D; Tue, 22 Apr 2014 22:31:23 +0100 +Received: from 5751dfa2.skybroadband.com ([87.81.223.162] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71) + (envelope-from ) + id 1WciHe-000071-LC; Tue, 22 Apr 2014 22:31:18 +0100 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH v2] test: Test thread linking in all possible delivery + orders +In-Reply-To: <1398110291-15832-1-git-send-email-amdragon@mit.edu> +References: <87y4zhfmrn.fsf@maritornes.cs.unb.ca> + <1398110291-15832-1-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Tue, 22 Apr 2014 22:31:10 +0100 +Message-ID: <87wqehaw69.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 87.81.223.162 +X-QM-Geographic: According to ripencc, + this message was delivered by a machine in Britain (UK) (GB). +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 5eb0dfbe17deb5b67783cb2efcf93ff8 (of first 20000 bytes) +X-SpamAssassin-Score: -0.1 +X-SpamAssassin-SpamBar: / +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -0.1 points. + Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.1 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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 21:31:37 -0000 + + +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 +> -- +> 1.9.1