From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5014D138359 for ; Fri, 9 Oct 2020 07:25:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9741E0863; Fri, 9 Oct 2020 07:25:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C044E085A for ; Fri, 9 Oct 2020 07:25:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A637340E72 for ; Fri, 9 Oct 2020 07:25:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1398D38E for ; Fri, 9 Oct 2020 07:25:25 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1602228314.8b91c42f9c41aa14d2510d548f8e1d28f66cd3b4.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/mitmproxy/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/mitmproxy/mitmproxy-5.2.ebuild X-VCS-Directories: net-proxy/mitmproxy/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 8b91c42f9c41aa14d2510d548f8e1d28f66cd3b4 X-VCS-Branch: master Date: Fri, 9 Oct 2020 07:25:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fda0ff2a-d00f-4c94-8a58-8ac821cd64ff X-Archives-Hash: 4ff6faebbe22039a8779c45673da0265 commit: 8b91c42f9c41aa14d2510d548f8e1d28f66cd3b4 Author: Matt Smith offtopica uk> AuthorDate: Fri Sep 4 12:03:50 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Oct 9 07:25:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b91c42f net-proxy/mitmproxy: Disable flaky tests Issue: https://github.com/mitmproxy/mitmproxy/issues/4136 Closes: https://bugs.gentoo.org/740336 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Matt Smith offtopica.uk> Signed-off-by: Joonas Niilola gentoo.org> net-proxy/mitmproxy/mitmproxy-5.2.ebuild | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/net-proxy/mitmproxy/mitmproxy-5.2.ebuild b/net-proxy/mitmproxy/mitmproxy-5.2.ebuild index d5ba12b4c7c..3a6b3954f6d 100644 --- a/net-proxy/mitmproxy/mitmproxy-5.2.ebuild +++ b/net-proxy/mitmproxy/mitmproxy-5.2.ebuild @@ -68,8 +68,24 @@ python_prepare_all() { # remove failing test sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die + # https://github.com/mitmproxy/mitmproxy/issues/4136 + # https://bugs.gentoo.org/740336 + rm test/mitmproxy/addons/test_termlog.py || die + # requires asynctest rm test/mitmproxy/addons/test_readfile.py || die + # Passes with OpenSSL 1.1.1g, fails with OpenSSL 1.1.1h + # https://github.com/gentoo/gentoo/pull/17411#discussion_r497270699 + sed \ + -e 's/test_mode_none_should_pass_without_sni/_&/g' \ + -e 's/test_mode_strict_w_pemfile_should_pass/_&/g' \ + -e 's/test_mode_strict_w_confdir_should_pass/_&/g' \ + -i test/mitmproxy/net/test_tcp.py || die + sed \ + -e 's/test_verification_w_confdir/_&/g' \ + -e 's/test_verification_w_pemfile/_&/g' \ + -i test/mitmproxy/proxy/test_server.py || die + distutils-r1_python_prepare_all }