From 43d86edf809827ad97f0f28415d4188766698758 Mon Sep 17 00:00:00 2001 From: Thomas Jost Date: Tue, 21 Feb 2012 17:05:43 +0100 Subject: [PATCH] [PATCH] Update crypto test for gmime 2.6.5 --- 9f/70e8b4ea4dad07bf11b840febe7c288ca9e439 | 99 +++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 9f/70e8b4ea4dad07bf11b840febe7c288ca9e439 diff --git a/9f/70e8b4ea4dad07bf11b840febe7c288ca9e439 b/9f/70e8b4ea4dad07bf11b840febe7c288ca9e439 new file mode 100644 index 000000000..0e575032f --- /dev/null +++ b/9f/70e8b4ea4dad07bf11b840febe7c288ca9e439 @@ -0,0 +1,99 @@ +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 5927E431FAF + for ; Tue, 21 Feb 2012 08:06:05 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.1 +X-Spam-Level: +X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1] + 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 O0PtBpCV4Z3t for ; + Tue, 21 Feb 2012 08:06:01 -0800 (PST) +Received: from ks3536.kimsufi.com (schnouki.net [87.98.217.222]) + by olra.theworths.org (Postfix) with ESMTP id 9BA72431FAE + for ; Tue, 21 Feb 2012 08:06:01 -0800 (PST) +Received: from thor.loria.fr (thor.loria.fr [152.81.12.250]) + by ks3536.kimsufi.com (Postfix) with ESMTPSA id 72BE86C000B; + Tue, 21 Feb 2012 17:06:00 +0100 (CET) +DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=schnouki.net; + s=key-schnouki; t=1329840360; + bh=O7xv1Km8W2iFZSi89ltLvc41ParGDtqbLNgiFNAIZdw=; + h=From:To:Subject:Date:Message-Id; + b=iphdEbQmK9i67pTtrXqo1SBgzJklPcKcUWJUJhF2PcGH9AbZUuA7s3iPCS/OV3BL0 + Cp2sci6SnL5pvXtUXpO0kE/sFrRG+XhikpCvNDLwg4gZGS7Z+PSsXFWNRp+10zbxPN + 61U5ea0bp/fhYfT5t5tRXs9xMOkm1DViN2ooJ+lI= +From: Thomas Jost +To: notmuch@notmuchmail.org +Subject: [PATCH] Update crypto test for gmime 2.6.5 +Date: Tue, 21 Feb 2012 17:05:43 +0100 +Message-Id: <1329840343-10026-1-git-send-email-schnouki@schnouki.net> +X-Mailer: git-send-email 1.7.9.1 +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, 21 Feb 2012 16:06:05 -0000 + +gmime 2.6 had a bug [1] which made it impossible to tell why a signature +verification failed when the signer key was unavailable (empty "sigstatus" field +in the JSON output). Since 00b5623d the corresponding test is marked as broken +when using gmime 2.6 (2.4 is fine). + +The bug has been fixed in gmime 2.6.5. Consequently, the crypto test needs to be +adjusted so that it is only marked broken for gmime 2.6.4 and below. + +[1] https://bugzilla.gnome.org/show_bug.cgi?id=668085 +--- + +Hello world, + +Here's a little update about gmime 2.6. The latest version (2.6.5) +fixes the little regression introduced in 2.6. + +In all honesty, I'm not sure adding such a workaround in the test +suite is worth the effort. If gmime 2.6.5 is quickly packaged by major +distros (it's already in Arch), we could as well make notmuch depend +on gmime >= 2.6.5. (One line to change in configure). Or we could just +stop trying to mark the test as broken and let it fail for buggy +versions of gmime. + +What do you think? + +Best regards, +Thomas + + test/crypto | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/crypto b/test/crypto +index 1dbb60a..cbab216 100755 +--- a/test/crypto ++++ b/test/crypto +@@ -104,8 +104,8 @@ test_expect_equal \ + "$expected" + + test_begin_subtest "signature verification with signer key unavailable" +-# this is broken with current versions of gmime-2.6 +-(ldd $(which notmuch) | grep -Fq gmime-2.6) && test_subtest_known_broken ++# this is broken with gmime-2.6.x for x <= 4 ++ldd $(which notmuch) | grep -Fq gmime-2.6 && pkg-config --max-version=2.6.4 gmime-2.6 && test_subtest_known_broken + # move the gnupghome temporarily out of the way + mv "${GNUPGHOME}"{,.bak} + output=$(notmuch show --format=json --verify subject:"test signed message 001" \ +-- +1.7.9.1 + -- 2.26.2