From b64e81110d6b33ccf4d46089041acd4be7b5d14f Mon Sep 17 00:00:00 2001 From: Tomas Radej Date: Wed, 29 Jan 2014 14:33:01 +0100 Subject: [PATCH] Fixed tty-fail patch --- 00142-skip-failing-pty-tests-in-rpmbuild.patch | 16 ++++++++-------- python.spec | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/00142-skip-failing-pty-tests-in-rpmbuild.patch b/00142-skip-failing-pty-tests-in-rpmbuild.patch index 414ffcd..2f51165 100644 --- a/00142-skip-failing-pty-tests-in-rpmbuild.patch +++ b/00142-skip-failing-pty-tests-in-rpmbuild.patch @@ -1,6 +1,6 @@ -diff -up Python-2.7.2/Lib/test/test_openpty.py.skip-failing-pty-tests-in-rpmbuild Python-2.7.2/Lib/test/test_openpty.py ---- Python-2.7.2/Lib/test/test_openpty.py.skip-failing-pty-tests-in-rpmbuild 2011-09-09 05:09:28.698920379 -0400 -+++ Python-2.7.2/Lib/test/test_openpty.py 2011-09-09 05:10:54.805914490 -0400 +diff -up Python-2.7.6/Lib/test/test_openpty.py.tty-fail Python-2.7.6/Lib/test/test_openpty.py +--- Python-2.7.6/Lib/test/test_openpty.py.tty-fail 2014-01-29 14:31:43.761343267 +0100 ++++ Python-2.7.6/Lib/test/test_openpty.py 2014-01-29 14:32:19.284090165 +0100 @@ -8,6 +8,7 @@ if not hasattr(os, "openpty"): @@ -8,11 +8,11 @@ diff -up Python-2.7.2/Lib/test/test_openpty.py.skip-failing-pty-tests-in-rpmbuil + @unittest._skipInRpmBuild('sometimes fails in Koji, possibly due to a mock issue (rhbz#714627)') def test(self): master, slave = os.openpty() - if not os.isatty(slave): -diff -up Python-2.7.2/Lib/test/test_pty.py.skip-failing-pty-tests-in-rpmbuild Python-2.7.2/Lib/test/test_pty.py ---- Python-2.7.2/Lib/test/test_pty.py.skip-failing-pty-tests-in-rpmbuild 2011-09-09 05:09:36.781919825 -0400 -+++ Python-2.7.2/Lib/test/test_pty.py 2011-09-09 05:11:14.741913127 -0400 -@@ -109,6 +109,7 @@ class PtyTest(unittest.TestCase): + self.addCleanup(os.close, master) +diff -up Python-2.7.6/Lib/test/test_pty.py.tty-fail Python-2.7.6/Lib/test/test_pty.py +--- Python-2.7.6/Lib/test/test_pty.py.tty-fail 2013-11-10 08:36:40.000000000 +0100 ++++ Python-2.7.6/Lib/test/test_pty.py 2014-01-29 14:31:43.761343267 +0100 +@@ -111,6 +111,7 @@ class PtyTest(unittest.TestCase): os.close(master_fd) diff --git a/python.spec b/python.spec index e53b506..1ee96ea 100644 --- a/python.spec +++ b/python.spec @@ -1159,7 +1159,7 @@ done %patch140 -p1 %endif %patch141 -p1 -%patch142 -p1 +%patch142 -p1 -b .tty-fail %patch143 -p1 -b .tsc-on-ppc %if !%{with_gdbm} %patch144 -p1