From e7488abc3bca561893d9d936d5073d4ace2b2e21 Mon Sep 17 00:00:00 2001
From: Robert Kuska <rkuska@redhat.com>
Date: Thu, 17 Mar 2016 10:18:47 +0100
Subject: [PATCH] Removed patch131 rhbz#1318565

---
 00131-disable-tests-in-test_io.patch | 11 -----------
 python3.spec                         | 13 +++----------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 00131-disable-tests-in-test_io.patch

diff --git a/00131-disable-tests-in-test_io.patch b/00131-disable-tests-in-test_io.patch
deleted file mode 100644
index d81a2d0..0000000
--- a/00131-disable-tests-in-test_io.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up Python-2.7.2/Lib/test/test_io.py.disable-tests-in-test_io Python-2.7.2/Lib/test/test_io.py
---- Python-2.7.2/Lib/test/test_io.py.disable-tests-in-test_io	2011-09-01 14:18:45.963304089 -0400
-+++ Python-2.7.2/Lib/test/test_io.py	2011-09-01 15:08:53.796098413 -0400
-@@ -2669,6 +2669,7 @@ class SignalsTest(unittest.TestCase):
-         self.check_interrupted_read_retry(lambda x: x,
-                                           mode="r")
- 
-+    @unittest.skip('rhbz#732998')
-     @unittest.skipUnless(threading, 'Threading required for this test.')
-     def check_interrupted_write_retry(self, item, **fdopen_kwargs):
-         """Check that a buffered write, when it gets interrupted (either
diff --git a/python3.spec b/python3.spec
index 5e0ffa3..49ff1e5 100644
--- a/python3.spec
+++ b/python3.spec
@@ -232,13 +232,6 @@ Patch104: 00104-lib64-fix-for-test_install.patch
 # Downstream only: not appropriate for upstream
 Patch111: 00111-no-static-lib.patch
 
-# 00131 #
-# The four tests in test_io built on top of check_interrupted_write_retry
-# fail when built in Koji, for ppc and ppc64; for some reason, the SIGALRM
-# handlers are never called, and the call to write runs to completion
-# (rhbz#732998)
-Patch131: 00131-disable-tests-in-test_io.patch
-
 # 00132 #
 # Add non-standard hooks to unittest for use in the "check" phase below, when
 # running selftests within the build:
@@ -466,6 +459,8 @@ Patch207: 00207-math-once.patch
 # rhbz#1292467
 Patch208: 00208-disable-test_with_pip-on-ppc.patch
 
+Patch209:0001-Expected-failure-hook.patch 
+
 # add correct arch for ppc64/ppc64le
 # it should be ppc64le-linux-gnu/ppc64-linux-gnu instead powerpc64le-linux-gnu/powerpc64-linux-gnu
 Patch5001: python3-powerppc-arch.patch
@@ -667,9 +662,6 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en
 %patch104 -p1
 %endif
 %patch111 -p1
-%ifarch ppc %{power64}
-%patch131 -p1
-%endif
 %patch132 -p1
 %patch137 -p1
 %ifarch %{arm}
@@ -707,6 +699,7 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en
 %patch206 -p1
 %patch207 -p1
 %patch208 -p1
+%patch209 -p1
 
 # Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there
 # are many differences between 2.6 and the Python 3 library.