Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/files/
Date: Tue, 14 Sep 2021 13:57:25
Message-Id: 1631627816.b146111a9dd0deb8993a7f244dca6d59edc69e01.arthurzam@gentoo
1 commit: b146111a9dd0deb8993a7f244dca6d59edc69e01
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Tue Sep 14 11:18:54 2021 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 14 13:56:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b146111a
7
8 dev-python/pytest: remove unused patch
9
10 Package-Manager: Portage-3.0.22, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/22295
13 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
14
15 .../pytest/files/pytest-4.6.10-timeout.patch | 35 ----------------------
16 1 file changed, 35 deletions(-)
17
18 diff --git a/dev-python/pytest/files/pytest-4.6.10-timeout.patch b/dev-python/pytest/files/pytest-4.6.10-timeout.patch
19 deleted file mode 100644
20 index 5bf9bcdbd8f..00000000000
21 --- a/dev-python/pytest/files/pytest-4.6.10-timeout.patch
22 +++ /dev/null
23 @@ -1,35 +0,0 @@
24 -diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
25 -index f1d739c99..72406b85d 100644
26 ---- a/src/_pytest/pytester.py
27 -+++ b/src/_pytest/pytester.py
28 -@@ -1209,7 +1209,7 @@ class Testdir(object):
29 - args = self._getpytestargs() + args
30 - return self.run(*args, timeout=timeout)
31 -
32 -- def spawn_pytest(self, string, expect_timeout=10.0):
33 -+ def spawn_pytest(self, string, expect_timeout=60.0):
34 - """Run pytest using pexpect.
35 -
36 - This makes sure to use the right pytest and sets up the temporary
37 -@@ -1223,7 +1223,7 @@ class Testdir(object):
38 - cmd = "%s --basetemp=%s %s" % (invoke, basetemp, string)
39 - return self.spawn(cmd, expect_timeout=expect_timeout)
40 -
41 -- def spawn(self, cmd, expect_timeout=10.0):
42 -+ def spawn(self, cmd, expect_timeout=60.0):
43 - """Run a command using pexpect.
44 -
45 - The pexpect child is returned.
46 -diff --git a/testing/test_terminal.py b/testing/test_terminal.py
47 -index 1b2e46c7c..52ba80f46 100644
48 ---- a/testing/test_terminal.py
49 -+++ b/testing/test_terminal.py
50 -@@ -138,7 +138,7 @@ class TestTerminal(object):
51 - """
52 - def test_1():
53 - import time
54 -- time.sleep(20)
55 -+ time.sleep(120)
56 - """
57 - )
58 - child = testdir.spawn_pytest("")