From 2f29816f9e84c201ec0be269db476f1aa179b307 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 22 Dec 2012 09:08:22 +2000 Subject: [PATCH] [Patch v8 13/18] test/tagging: add test for exotic message-ids and batch tagging --- 79/535368713ef6ea303583018132bcd7ef67a962 | 96 +++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 79/535368713ef6ea303583018132bcd7ef67a962 diff --git a/79/535368713ef6ea303583018132bcd7ef67a962 b/79/535368713ef6ea303583018132bcd7ef67a962 new file mode 100644 index 000000000..85e639131 --- /dev/null +++ b/79/535368713ef6ea303583018132bcd7ef67a962 @@ -0,0 +1,96 @@ +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 9281F431FAF + for ; Fri, 21 Dec 2012 05:08:48 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 4jE3WWUKmHQp for ; + Fri, 21 Dec 2012 05:08:47 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 4D480431FD4 + for ; Fri, 21 Dec 2012 05:08:39 -0800 (PST) +Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.82.78] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) + (envelope-from ) + id 1Tm2L7-0005dj-KV; Fri, 21 Dec 2012 09:08:37 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1Tm2L2-0005zg-5t; Fri, 21 Dec 2012 09:08:32 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v8 13/18] test/tagging: add test for exotic message-ids and + batch tagging +Date: Fri, 21 Dec 2012 09:08:22 -0400 +Message-Id: <1356095307-22895-13-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1356095307-22895-1-git-send-email-david@tethera.net> +References: <1356095307-22895-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +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: Fri, 21 Dec 2012 13:08:49 -0000 + +From: David Bremner + +The (now fixed) bug that this test revealed is that unquoted +message-ids with whitespace or other control characters in them are +split into several tokens by the Xapian query parser. +--- + test/tagging | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/test/tagging b/test/tagging +index 18f532e..1d59af0 100755 +--- a/test/tagging ++++ b/test/tagging +@@ -200,6 +200,24 @@ notmuch dump --format=batch-tag | sort > OUTPUT + notmuch restore --format=batch-tag < BACKUP + test_expect_equal_file EXPECTED OUTPUT + ++test_begin_subtest '--batch: unicode message-ids' ++ ++${TEST_DIRECTORY}/random-corpus --config-path=${NOTMUCH_CONFIG} \ ++ --num-messages=100 ++ ++notmuch dump --format=batch-tag | sed 's/^.* -- /+common_tag -- /' | \ ++ sort > EXPECTED ++ ++notmuch dump --format=batch-tag | sed 's/^.* -- / -- /' | \ ++ notmuch restore --format=batch-tag ++ ++notmuch tag --batch < EXPECTED ++ ++notmuch dump --format=batch-tag| \ ++ sort > OUTPUT ++ ++test_expect_equal_file EXPECTED OUTPUT ++ + test_expect_code 1 "Empty tag names" 'notmuch tag + One' + + test_expect_code 1 "Tag name beginning with -" 'notmuch tag +- One' +-- +1.7.10.4 + -- 2.26.2