From 5fadc39f899191b27381c156525deda1922d9412 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 7 Jan 2013 23:16:52 +2000 Subject: [PATCH] [Patch v2 7/9] test/tagging: add test for exotic message-ids and batch tagging --- b8/139db35a648752a90c5d3dc94cebcd50602f42 | 96 +++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 b8/139db35a648752a90c5d3dc94cebcd50602f42 diff --git a/b8/139db35a648752a90c5d3dc94cebcd50602f42 b/b8/139db35a648752a90c5d3dc94cebcd50602f42 new file mode 100644 index 000000000..cf12355c7 --- /dev/null +++ b/b8/139db35a648752a90c5d3dc94cebcd50602f42 @@ -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 8F0A9431FD4 + for ; Sun, 6 Jan 2013 19:17:13 -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 eMsOgtj2NC5Y for ; + Sun, 6 Jan 2013 19:17:13 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2777F429E38 + for ; Sun, 6 Jan 2013 19:17:12 -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.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) + (envelope-from ) + id 1Ts3D3-0002e2-U2; Sun, 06 Jan 2013 23:17:10 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1Ts3Cy-0001iG-F4; Sun, 06 Jan 2013 23:17:04 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v2 7/9] test/tagging: add test for exotic message-ids and + batch tagging +Date: Sun, 6 Jan 2013 23:16:52 -0400 +Message-Id: <1357528614-6413-8-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1357528614-6413-1-git-send-email-david@tethera.net> +References: <1357528614-6413-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: Mon, 07 Jan 2013 03:17:13 -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 417112b..1717e72 100755 +--- a/test/tagging ++++ b/test/tagging +@@ -198,6 +198,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