From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2L2/Dkayj2J8pQAAbAwnHQ (envelope-from ) for ; Thu, 26 May 2022 19:00:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id ACWLDkayj2ITbQEAauVa8A (envelope-from ) for ; Thu, 26 May 2022 19:00:54 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AEED38650 for ; Thu, 26 May 2022 19:00:53 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 7C4F55F782; Thu, 26 May 2022 16:52:48 +0000 (UTC) Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by mail.notmuchmail.org (Postfix) with ESMTPS id 6B5455F710 for ; Thu, 26 May 2022 16:52:45 +0000 (UTC) Received: by mail-ed1-x532.google.com with SMTP id d22so2514350edj.4 for ; Thu, 26 May 2022 09:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=onrbv5fq8gHxSq0oiGnTG6PhAYcc1//N/C5pc1CHfT4=; b=qia4T1FTZyMH5gjyEl2WRDUI7x/NBVELsvC00g8TyOvvqC+zOQccQUpWZ+V+M556XZ /RUUCYZReVjTkQbHMAlaBSc5h/QDz64uXblGFJ+5OltUtyeRDSdcKzMOHRsrCI52zzhZ lrx0yHQWG4OxMzxsWebAeQxjfdUG7cTg1JmBCFAkI075I0BmJfwDapbA0NrPJTe++/uQ VbJB4WEppx63uciisLKcR/1MNA2vEzXhrK6DPhhXeR/w43pNmebtphQJUn8T4H/ksLyb HuL1i0iSHqLdBkqYGyee/3lby5uoBud0hKHznT3aJshI99Yf2GxZOzD/yaE1HVCzc2ZV 4MgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=onrbv5fq8gHxSq0oiGnTG6PhAYcc1//N/C5pc1CHfT4=; b=q5+y+z3ZV5upsGSOQ79Mjqj2r6VrGJ+qhk3Pjy1/r23oLkJT9UyGyllgiNjYzmJok5 I+fwN8v5/uSZaBZhNDhy3a2pM1aL6XRA5dzXAGjN9oM+daKFOs4AQPLfB/p3pti4tVgA D3VlN0oYuq5PDuoOXjOTMc0xxxPkoOMQi0x9CLkhhzCJgAKeXp5ZAEdP76sej3d7vWtV Ja8C1KIiXxruJ+lH03A2Km0jLVNc4UXnwpufIyxepa30WP2j45bq+reaZq4zevdn2olc 5At5LGnC6aDoAA4JHFYCgZyJv4wABCjx9nQSapWuCAUro49eA+pvey0B+jZRNCFv98oj KRaA== X-Gm-Message-State: AOAM530Z3O7lihXQ1htgjA8QMl4xchLyOax+FxzaYElu2Oaqk7HwZeW7 dmjWSUuruESJTW95dpQFecEPlApwMEc= X-Google-Smtp-Source: ABdhPJxRlnIFcU++2aVJ3PbwFOZqmH6QEir2+sInylRqQVrbrh2jbzBLcHYUqVUbNqdvg/GxFskbvw== X-Received: by 2002:a05:6402:1445:b0:42b:cc8a:a309 with SMTP id d5-20020a056402144500b0042bcc8aa309mr8680612edx.43.1653583964379; Thu, 26 May 2022 09:52:44 -0700 (PDT) Received: from localhost ([2001:9e8:6a6b:8f00:cfbc:1862:f7c2:3b00]) by smtp.gmail.com with ESMTPSA id s4-20020a170906354400b006fe98c7c7a9sm664478eja.85.2022.05.26.09.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 09:52:43 -0700 (PDT) Sender: Michael J Gruber From: michaeljgruber+grubix+git@gmail.com To: notmuch@notmuchmail.org Subject: [PATCH] test: make T450 independent of application/octet-stream interpretation Date: Thu, 26 May 2022 18:52:32 +0200 Message-Id: <1f3f72e8e10111b08fe5b024116c952f5c1153aa.1653582481.git.git@grubix.eu> X-Mailer: git-send-email 2.36.1.258.gea251483f2 MIME-Version: 1.0 Message-ID-Hash: I3FZMA5XY5IOQEMFE5NXX5S4PN6JPZKB X-Message-ID-Hash: I3FZMA5XY5IOQEMFE5NXX5S4PN6JPZKB X-MailFrom: michaeljgruber+grubix+git@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michael J Gruber X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653584453; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=FRbvmcT3vtP/eFXfYRlf5RtJ/v1bVCh7rLIRrs7Bz5A=; b=GKkwG+Y+g1JV62Y0Jkp6c9/Ur/Op20IjdLaCOXWBywQd8/zWAV49AGIpNacOI8CxloJTuQ 2+Advc+mDuryKIhm9HDW9TeOHhFq3ccntl4QRqbVvKKNxCZE/B+KHNyfqkhWqCQH9N/a9V bhijmQmir+Ylkplkc1GE6Ds8jtB+7BeIJhbwTLKl+g5A8ql85k3nj8/b2OqUgblBaHOYxx 83u6Vvzxn8g9lEmsOf5v5jb+mryjhlV0xFtUyPsWW9PIEsv8OOr8Fz3OmQzT1MI14Xp/x4 usolJJ7sCN3WGOcZO0bryRN6IHTfeW+sfuZbLK3REdQZrFmlVJ14AZL78hEwMg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653584453; a=rsa-sha256; cv=none; b=kAW3lhvSFmIjbK/koE6Q240TC8PVhgQTy8f+A5Wm/rov4cN/JgvVTlij9lLVtKqoyoE19D epiQZy3chvO/JdcuzbDfay+MQcR9TRgQ9atnfkannO+u669VVWxAOd+KtzT/oFZXd3x4UD BPH5xfppbTm09HnGzqyC2AkQu1dRLGrWkHGWLs/kZK0MYlzhqouGJBwuJa/gO2pNDrIIDY YNPfv7MGQSzkAfKWtXkhiajbssQ9upEexp75dtSXBoJUmzCKNtlmvxt0nSlcy8+5bL6Yy8 /06nv6+gboznWyjZo8lppCuV31VnIZF5HcUQt5MKRrfGCFa65JLe/4pTE/l5hA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=qia4T1FT; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 6.48 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=qia4T1FT; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: AEED38650 X-Spam-Score: 6.48 X-Migadu-Scanner: scn0.migadu.com X-TUID: G6HiFxpxt+rZ From: Michael J Gruber The actual content type of `application/octet-stream` is up to content type detection of the reader, and thus may not be stable across implementations or versions. This showed up when fd46fc19 ("emacs: document/defcustom notmuch-multipart/alternative-discouraged", 2022-05-14) introduced a test for omitting a part of type `text/html` because it expected a part of type `application/octet-stream` to remain in place, i.e. a part of "unstable type". In particular, tests with `fd46fc19` would succeed on RHEL/EPEL but fail on all current Fedoras with ``` FAIL multipart/alternative hides html by default --- T450-emacs-show.16.notmuch-show-multipart-alternative 2022-05-26 15:34:42.100557244 +0000 +++ T450-emacs-show.16.OUTPUT 2022-05-26 15:34:42.102557207 +0000 @@ -24,7 +24,7 @@ uses 64 as the buffer size. [ text/html (hidden) ] -[ 0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch: application/octet-stream (as text/x-diff) ] +[ 0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch: application/octet-stream (as text/x-patch) ] From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001 From: Alexander Botero-Lowry Date: Tue, 17 Nov 2009 11:30:39 -0800 ``` due to the different type detected. Fix this by giving that message a specicific type of `text/x-diff` in the test corpus, and adjust all affected test outputs. Signed-off-by: Michael J Gruber --- I hope the diff in the commit message doesn't create problems ... `git am` should be okay with it, `patch` not so much. test/corpora/default/bar/baz/05:2, | 2 +- .../notmuch-show-multipart-alternative | 2 +- test/emacs.expected-output/raw-message-cf0c4d-52ad0a | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/corpora/default/bar/baz/05:2, b/test/corpora/default/bar/baz/05:2, index 75b05fa4..02b23965 100644 --- a/test/corpora/default/bar/baz/05:2, +++ b/test/corpora/default/bar/baz/05:2, @@ -63,7 +63,7 @@ and Date: Tue, 17 Nov 2009 11:30:39 -0800 diff --git a/test/emacs.expected-output/raw-message-cf0c4d-52ad0a b/test/emacs.expected-output/raw-message-cf0c4d-52ad0a index 75b05fa4..02b23965 100644 --- a/test/emacs.expected-output/raw-message-cf0c4d-52ad0a +++ b/test/emacs.expected-output/raw-message-cf0c4d-52ad0a @@ -63,7 +63,7 @@ and