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 BAFFC1382C5 for ; Wed, 27 May 2020 06:11:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63C1EE09BC; Wed, 27 May 2020 06:11:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 4B32AE09BC for ; Wed, 27 May 2020 06:11:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 87FAF34E8E7 for ; Wed, 27 May 2020 06:11:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5718A279 for ; Wed, 27 May 2020 06:11:00 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1590559856.dec727090083f7a7e3e3fa1d2dfd26ad8ff5be50.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pytest/files/pytest-4.6.10-timeout.patch dev-python/pytest/pytest-4.6.10.ebuild X-VCS-Directories: dev-python/pytest/ dev-python/pytest/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: dec727090083f7a7e3e3fa1d2dfd26ad8ff5be50 X-VCS-Branch: master Date: Wed, 27 May 2020 06:11:00 +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: 3dd9b3e0-c4b7-4312-962b-dbf6ff9e9279 X-Archives-Hash: 3e4336db5d7b0dc030845e587b3ce306 commit: dec727090083f7a7e3e3fa1d2dfd26ad8ff5be50 Author: Michał Górny gentoo org> AuthorDate: Wed May 27 06:10:11 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 27 06:10:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec72709 dev-python/pytest: Increase timeouts in 4.6.10 for slower machines Signed-off-by: Michał Górny gentoo.org> .../pytest/files/pytest-4.6.10-timeout.patch | 35 ++++++++++++++++++++++ dev-python/pytest/pytest-4.6.10.ebuild | 1 + 2 files changed, 36 insertions(+) diff --git a/dev-python/pytest/files/pytest-4.6.10-timeout.patch b/dev-python/pytest/files/pytest-4.6.10-timeout.patch new file mode 100644 index 00000000000..5bf9bcdbd8f --- /dev/null +++ b/dev-python/pytest/files/pytest-4.6.10-timeout.patch @@ -0,0 +1,35 @@ +diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py +index f1d739c99..72406b85d 100644 +--- a/src/_pytest/pytester.py ++++ b/src/_pytest/pytester.py +@@ -1209,7 +1209,7 @@ class Testdir(object): + args = self._getpytestargs() + args + return self.run(*args, timeout=timeout) + +- def spawn_pytest(self, string, expect_timeout=10.0): ++ def spawn_pytest(self, string, expect_timeout=60.0): + """Run pytest using pexpect. + + This makes sure to use the right pytest and sets up the temporary +@@ -1223,7 +1223,7 @@ class Testdir(object): + cmd = "%s --basetemp=%s %s" % (invoke, basetemp, string) + return self.spawn(cmd, expect_timeout=expect_timeout) + +- def spawn(self, cmd, expect_timeout=10.0): ++ def spawn(self, cmd, expect_timeout=60.0): + """Run a command using pexpect. + + The pexpect child is returned. +diff --git a/testing/test_terminal.py b/testing/test_terminal.py +index 1b2e46c7c..52ba80f46 100644 +--- a/testing/test_terminal.py ++++ b/testing/test_terminal.py +@@ -138,7 +138,7 @@ class TestTerminal(object): + """ + def test_1(): + import time +- time.sleep(20) ++ time.sleep(120) + """ + ) + child = testdir.spawn_pytest("") diff --git a/dev-python/pytest/pytest-4.6.10.ebuild b/dev-python/pytest/pytest-4.6.10.ebuild index 76710136e68..c8234af1fa7 100644 --- a/dev-python/pytest/pytest-4.6.10.ebuild +++ b/dev-python/pytest/pytest-4.6.10.ebuild @@ -60,6 +60,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch" + "${FILESDIR}/${P}-timeout.patch" ) python_prepare_all() {