From patchwork Sun Oct 28 12:40:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 49 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EF38316754; Sun, 28 Oct 2018 12:44:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_FRT_STOCK2,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 7D83016750 for ; Sun, 28 Oct 2018 12:44:56 +0000 (GMT) Received: from localhost ([::1]:40028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkR5-0002wp-NP for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:44:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkOP-0008W2-EU for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOK-0004aB-TO for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42541) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOK-0004a3-Om for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOK-0007No-Lx for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 7/7] gnu: python-3.6: Disable congestion test. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073048628293 (code B ref 33186); Sun, 28 Oct 2018 12:42:04 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:26 +0000 Received: from localhost ([127.0.0.1]:46793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNi-0007MH-9d for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:26 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:39067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNc-0007Lc-OE for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:21 -0400 Received: by mail-pg1-f196.google.com with SMTP id r9-v6so2574841pgv.6 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jaRgsKEtsOGvff3jsdHVdXiEg5hRtsO6IGurGYIZocw=; b=IJ/VR3sPTZsIUfITx8scvvwpuQV/auOUxIhvIOg6W164es/23A8wPkYzl8oIPA/bV9 rC//5qj9xSTcRqbzrv0WoednEQAsCWCPXJKur5V/L1XOXg1QOKxdvrM+AtbE/BWuzZvq WaTfMyP/ZSwiL8W4TwVMTYMyDP59vn4ypTWIz5YUeb7YtETdg8V3bnIwcpa41Z9Mrs8I E+a6fLqV/yMwTTa7VSZeWQiVk96bVjQkEaHq9Yd0WItRd38I63gGYwK8rrNFbtDc3EZ/ FUtm9slvPhk6NkJEuP1pJsAo7sv9gUTvnrRNJ/ZdyARCTAPDHxyRH82n3/3qWP0UYBJ7 mcvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jaRgsKEtsOGvff3jsdHVdXiEg5hRtsO6IGurGYIZocw=; b=E2CrWfD6szebk/HTF+/aK/I40nvNKIBk3YQdglyZ6By5FIdlWyzAHlnTKTwHv9mL/x I/tIxVtc2hvNk8a9rDIxeN9k3nEsFzVbpDT6WTU1qiis1Z2kwgcDHIFW57RjNraP7JYG Yj0td27/Q+CTGIX16ZQpTZ3EG/hqvVSEo3g5cFHbgcdAXxJ8LK/gLIP8L149rZSUF6nv xxBRanwkEbEutb0PFgFMuH+HSk3gb4JPRxVnmgr2FfHW7pg4NRPh0XwzzKY4atGuZBqp 5Q4COE2EnnVDsjl7OQULCUVTpQcdShCpWjdEqsq4xyJrEJvEDi0wwsNhfRhR2I6CMdOQ OtNw== X-Gm-Message-State: AGRZ1gKDEfUdbaTHcNhbv5yTE7oQDa+7bP1INqXRaK3aRcquEiQEZv/y KpLaLHqMnVMq+IpbzObOMwAhiT5+ X-Google-Smtp-Source: AJdET5dZzNt74OBCBiNbHKk7UaeaW6ZW9BuFon7Pa5GKLxvh4SLVKKXW6edcc86CyN1MziJc4lVaFA== X-Received: by 2002:a62:a50d:: with SMTP id v13-v6mr11016995pfm.18.1540730474934; Sun, 28 Oct 2018 05:41:14 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.41.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:41:14 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:43 +0900 Message-Id: <20181028124043.21773-8-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The socket congestion test is known to hang or fail randomly. It is disabled on python 3.6 branch upstream. * gnu/packages/patches/python-disable-congestion-test.patch: New file. * gnu/packages/python.scm (python-3.6)[patches]: Add the previous patch. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../python-disable-congestion-test.patch | 60 +++++++++++++++++++ gnu/packages/python.scm | 1 + 3 files changed, 62 insertions(+) create mode 100644 gnu/packages/patches/python-disable-congestion-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0828f4358..11974903d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \ + %D%/packages/patches/python-disable-congestion-test.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-fix-tests.patch \ diff --git a/gnu/packages/patches/python-disable-congestion-test.patch b/gnu/packages/patches/python-disable-congestion-test.patch new file mode 100644 index 000000000..eca2379cf --- /dev/null +++ b/gnu/packages/patches/python-disable-congestion-test.patch @@ -0,0 +1,60 @@ +This patch is taken from python upstream repository: + https://bugs.python.org/issue34587. + +From 7484bdfd1e2e33fdd2c44dd4ffa044aacd495337 Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Mon, 17 Sep 2018 14:01:20 -0700 +Subject: [PATCH] bpo-34587, test_socket: remove RDSTest.testCongestion() + (GH-9277) + +The test tries to fill the receiver's socket buffer and expects an +error. But the RDS protocol doesn't require that. Moreover, the Linux +implementation of RDS expects that the producer of the messages +reduces its rate, it's not the role of the receiver to trigger an +error. + +The test fails on Fedora 28 by design, so remove it. +--- + Lib/test/test_socket.py | 27 ------------------- + .../2018-09-13-20-58-07.bpo-34587.rCcxp3.rst | 5 ++++ + 2 files changed, 5 insertions(+), 27 deletions(-) + create mode 100644 Misc/NEWS.d/next/Tests/2018-09-13-20-58-07.bpo-34587.rCcxp3.rst + +diff --git Lib/test/test_socket.py Lib/test/test_socket.py +index 4f3c4774e4..f4d58ebf71 100644 +--- Lib/test/test_socket.py ++++ Lib/test/test_socket.py +@@ -2054,33 +2054,6 @@ class RDSTest(ThreadedRDSSocketTest): + self.data = b'select' + self.cli.sendto(self.data, 0, (HOST, self.port)) + +- def testCongestion(self): +- # wait until the sender is done +- self.evt.wait() +- +- def _testCongestion(self): +- # test the behavior in case of congestion +- self.data = b'fill' +- self.cli.setblocking(False) +- try: +- # try to lower the receiver's socket buffer size +- self.cli.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 16384) +- except OSError: +- pass +- with self.assertRaises(OSError) as cm: +- try: +- # fill the receiver's socket buffer +- while True: +- self.cli.sendto(self.data, 0, (HOST, self.port)) +- finally: +- # signal the receiver we're done +- self.evt.set() +- # sendto() should have failed with ENOBUFS +- self.assertEqual(cm.exception.errno, errno.ENOBUFS) +- # and we should have received a congestion notification through poll +- r, w, x = select.select([self.serv], [], [], 3.0) +- self.assertIn(self.serv, r) +- + + @unittest.skipIf(fcntl is None, "need fcntl") + @unittest.skipUnless(HAVE_SOCKET_VSOCK, diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fbb280224..37755287c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -377,6 +377,7 @@ data types.") (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) (patches (search-patches + "python-disable-congestion-test.patch" "python-fix-tests.patch" "python-3-fix-tests.patch" "python-3-deterministic-build-info.patch"