From b2766547f59e5ae61776800f0a9e08b028d391ea Mon Sep 17 00:00:00 2001 From: Tomas Radej Date: Wed, 29 Jan 2014 14:27:21 +0100 Subject: [PATCH] Fixed stdin-test patch --- ...p-tests-of-seeking-stdin-in-rpmbuild.patch | 19 ++++--------------- python.spec | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch b/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch index 845fb2a..1214055 100644 --- a/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch +++ b/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch @@ -1,7 +1,7 @@ -diff -up Python-2.7.2/Lib/test/test_file2k.py.skip-tests-of-seeking-stdin-in-rpmbuild Python-2.7.2/Lib/test/test_file2k.py ---- Python-2.7.2/Lib/test/test_file2k.py.skip-tests-of-seeking-stdin-in-rpmbuild 2011-09-08 17:23:50.922520729 -0400 -+++ Python-2.7.2/Lib/test/test_file2k.py 2011-09-08 17:24:41.368517277 -0400 -@@ -213,6 +213,7 @@ class OtherFileTests(unittest.TestCase): +diff -up Python-2.7.6/Lib/test/test_file2k.py.stdin-test Python-2.7.6/Lib/test/test_file2k.py +--- Python-2.7.6/Lib/test/test_file2k.py.stdin-test 2013-11-10 08:36:40.000000000 +0100 ++++ Python-2.7.6/Lib/test/test_file2k.py 2014-01-29 14:28:01.029488055 +0100 +@@ -223,6 +223,7 @@ class OtherFileTests(unittest.TestCase): else: f.close() @@ -9,14 +9,3 @@ diff -up Python-2.7.2/Lib/test/test_file2k.py.skip-tests-of-seeking-stdin-in-rpm def testStdin(self): # This causes the interpreter to exit on OSF1 v5.1. if sys.platform != 'osf1V5': -diff -up Python-2.7.2/Lib/test/test_file.py.skip-tests-of-seeking-stdin-in-rpmbuild Python-2.7.2/Lib/test/test_file.py ---- Python-2.7.2/Lib/test/test_file.py.skip-tests-of-seeking-stdin-in-rpmbuild 2011-09-08 17:20:31.146534389 -0400 -+++ Python-2.7.2/Lib/test/test_file.py 2011-09-08 17:24:45.016517030 -0400 -@@ -154,6 +154,7 @@ class OtherFileTests(unittest.TestCase): - f.close() - self.fail('%r is an invalid file mode' % mode) - -+ @unittest._skipInRpmBuild('seems not to raise the exception when run in Koji') - def testStdin(self): - # This causes the interpreter to exit on OSF1 v5.1. - if sys.platform != 'osf1V5': diff --git a/python.spec b/python.spec index 83920a7..e53b506 100644 --- a/python.spec +++ b/python.spec @@ -1149,7 +1149,7 @@ done %patch133 -p1 %patch134 -p1 %patch135 -p1 -%patch136 -p1 +%patch136 -p1 -b .stdin-test %patch137 -p1 %patch138 -p1 %ifarch %{arm}