From 0a93f9db1068342de8b5ea7bcca4e9355f937bd8 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Thu, 24 Mar 2016 12:12:20 +0100 Subject: [PATCH] Remove ppc specific patch which skipped check_interrupted_write tests --- ...sable-interrupted_write-tests-on-ppc.patch | 52 ------------------- python3.spec | 9 ---- 2 files changed, 61 deletions(-) delete mode 100644 00164-disable-interrupted_write-tests-on-ppc.patch diff --git a/00164-disable-interrupted_write-tests-on-ppc.patch b/00164-disable-interrupted_write-tests-on-ppc.patch deleted file mode 100644 index 5641b4b..0000000 --- a/00164-disable-interrupted_write-tests-on-ppc.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up Python-3.4.2/Lib/test/test_exceptions.py.ppc Python-3.4.2/Lib/test/test_exceptions.py ---- Python-3.4.2/Lib/test/test_exceptions.py.ppc 2014-10-08 04:18:13.000000000 -0400 -+++ Python-3.4.2/Lib/test/test_exceptions.py 2015-01-12 05:56:15.922833055 -0500 -@@ -429,6 +429,7 @@ class ExceptionTests(unittest.TestCase): - self.assertIsNone(e.__context__) - self.assertIsNone(e.__cause__) - -+ @unittest.skip('rhbz#846849') - def testChainingDescriptors(self): - try: - raise Exception() -diff -up Python-3.4.2/Lib/test/test_io.py.ppc Python-3.4.2/Lib/test/test_io.py ---- Python-3.4.2/Lib/test/test_io.py.ppc 2015-01-12 05:56:15.922833055 -0500 -+++ Python-3.4.2/Lib/test/test_io.py 2015-01-12 05:58:23.482833055 -0500 -@@ -3296,12 +3296,15 @@ class SignalsTest(unittest.TestCase): - if e.errno != errno.EBADF: - raise - -+ @unittest.skip('rhbz#846849') - def test_interrupted_write_unbuffered(self): - self.check_interrupted_write(b"xy", b"xy", mode="wb", buffering=0) - -+ @unittest.skip('rhbz#846849') - def test_interrupted_write_buffered(self): - self.check_interrupted_write(b"xy", b"xy", mode="wb") - -+ @unittest.skip('rhbz#846849') - # Issue #22331: The test hangs on FreeBSD 7.2 - @support.requires_freebsd_version(8) - def test_interrupted_write_text(self): -diff -up Python-3.4.2/Lib/test/test_raise.py.ppc Python-3.4.2/Lib/test/test_raise.py ---- Python-3.4.2/Lib/test/test_raise.py.ppc 2014-10-08 04:18:14.000000000 -0400 -+++ Python-3.4.2/Lib/test/test_raise.py 2015-01-12 05:56:15.922833055 -0500 -@@ -151,6 +151,7 @@ class TestRaise(unittest.TestCase): - - class TestCause(unittest.TestCase): - -+ @unittest.skip('rhbz#846849') - def testCauseSyntax(self): - try: - try: -diff -up Python-3.4.2/Lib/test/test_traceback.py.ppc Python-3.4.2/Lib/test/test_traceback.py ---- Python-3.4.2/Lib/test/test_traceback.py.ppc 2014-10-08 04:18:14.000000000 -0400 -+++ Python-3.4.2/Lib/test/test_traceback.py 2015-01-12 05:56:15.922833055 -0500 -@@ -314,6 +314,7 @@ class BaseExceptionReportingTests: - self.check_zero_div(blocks[0]) - self.assertIn('inner_raise() # Marker', blocks[2]) - -+ @unittest.skip('rhbz#846849') - def test_context_suppression(self): - try: - try: diff --git a/python3.spec b/python3.spec index c81b3b0..fa2c82a 100644 --- a/python3.spec +++ b/python3.spec @@ -320,12 +320,6 @@ Patch160: 00160-disable-test_fs_holes-in-rpm-build.patch # Not yet sent upstream Patch163: 00163-disable-parts-of-test_socket-in-rpm-build.patch -# 0164 # -# some tests in test._io interrupted_write-* fail on PPC (rhbz#846849) -# testChainingDescriptors test in test_exceptions fails on PPc, too (rhbz#846849) -# disable those tests so that rebuilds on PPC can continue -Patch164: 00164-disable-interrupted_write-tests-on-ppc.patch - # 00170 # # In debug builds, try to print repr() when a C-level assert fails in the # garbage collector (typically indicating a reference-counting error @@ -653,9 +647,6 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en %patch157 -p1 %patch160 -p1 %patch163 -p1 -%ifarch ppc %{power64} -%patch164 -p1 -%endif %patch173 -p1 %patch178 -p1 %patch179 -p1