public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
Date: Wed, 27 May 2020 06:11:00 +0000 (UTC)	[thread overview]
Message-ID: <1590559856.dec727090083f7a7e3e3fa1d2dfd26ad8ff5be50.mgorny@gentoo> (raw)

commit:     dec727090083f7a7e3e3fa1d2dfd26ad8ff5be50
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 06:10:11 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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() {


             reply	other threads:[~2020-05-27  6:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-27  6:11 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-18 12:50 [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/ Michał Górny
2024-06-22 15:01 Michał Górny
2024-05-19 11:47 Michał Górny
2022-05-13 12:29 Michał Górny
2021-10-03 19:24 Michał Górny
2021-06-02 19:46 Michał Górny
2019-11-27 13:17 Michał Górny
2019-07-06  8:43 Tim Harder
2018-07-11 22:11 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1590559856.dec727090083f7a7e3e3fa1d2dfd26ad8ff5be50.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox