From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id E0B0B6DE13FF for ; Thu, 2 May 2019 06:19:54 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.145 X-Spam-Level: X-Spam-Status: No, score=-0.145 tagged_above=-999 required=5 tests=[AWL=0.056, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4NOdKLrnaM6u for ; Thu, 2 May 2019 06:19:54 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id 8ECBB6DE105F for ; Thu, 2 May 2019 06:19:52 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1556803191; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=iOtrWRmrlGYlmDF9lOd4CMlJK3ISI0O6Yf1qZDLnzfs=; b=5FOczVlQKUUZEUxoB1jzqV8xLYkZK6/ME9bMPG7LKGPAsqspgGHeSMf3 icfjtT+UTAv0FK/4LawPuIpkCr/EDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1556803191; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=iOtrWRmrlGYlmDF9lOd4CMlJK3ISI0O6Yf1qZDLnzfs=; b=owaujZdH5kmOCMMexUgFkFIMew8Xuv/v4XfWbO6eLBgASW1rT2MzAjGQ wAvcBqlwhWWyWAXIagv84NUjyfJ8N4D3uF7yHwaIyBDmuNOE2wTgbZ8zOR iEXNQlJuDO32Y0f0eXWPJvoa+U17a4Yylu0mK7S25Lj8fH+XqUl50gDj9/ j0mgVZBx9Olgp0idFUCfC3ynkDsdq80guGplQ4e0sL9JxtVUvZ1b1LBB5t ZyymYHuW866Y/rxa81hcGUvbSQ7Dzxy3iIE39TigP0Xobj7dEkptDh/i56 a5hvdqWM7Y9cKLSwDzUT4TjiysiWkhPj3QP3xw/4kEtjSRgDHWGo5A== Received: from fifthhorseman.net (ool-6c3a0662.static.optonline.net [108.58.6.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 0E201F9A2 for ; Thu, 2 May 2019 09:19:51 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id B5B5720CC8; Thu, 2 May 2019 09:19:47 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH v2 07/15] gmime-cleanup: simplify T355-smime.sh Date: Thu, 2 May 2019 09:19:39 -0400 Message-Id: <20190502131947.16509-7-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502131947.16509-1-dkg@fifthhorseman.net> References: <20190502051653.8502-1-dkg@fifthhorseman.net> <20190502131947.16509-1-dkg@fifthhorseman.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 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: Thu, 02 May 2019 13:19:55 -0000 GMime 3.0 and later can handle User ID as expected. signed-off-by: Daniel Kahn Gillmor --- test/T355-smime.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/T355-smime.sh b/test/T355-smime.sh index be45e3b1..e410286b 100755 --- a/test/T355-smime.sh +++ b/test/T355-smime.sh @@ -48,12 +48,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "signature verification (notmuch CLI)" -if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then - # gmime 2 can't report User IDs properly for S/MIME - USERID='' -else - USERID='"userid": "CN=Notmuch Test Suite",' -fi output=$(notmuch show --format=json --verify subject:"test signed message 001" \ | notmuch_json_show_sanitize \ | sed -e 's|"created": [-1234567890]*|"created": 946728000|' \ @@ -71,7 +65,8 @@ expected='[[[{"id": "XXXXX", "Date": "Sat, 01 Jan 2000 12:00:00 +0000"}, "body": [{"id": 1, "sigstatus": [{"fingerprint": "'$FINGERPRINT'", - "status": "good",'$USERID' + "status": "good", + "userid": "CN=Notmuch Test Suite", "expires": 424242424, "created": 946728000}], "content-type": "multipart/signed", -- 2.20.1