From ff4d48f430b8799c1ca174ebcc27db11bf860cc7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 5 Mar 2019 15:35:12 +0100 Subject: [PATCH] Reenable RecvmsgGenericStreamTests.testRecvmsgEOF() Reenable RecvmsgGenericStreamTests.testRecvmsgEOF() of test_socket: remove 00163-disable-parts-of-test_socket-in-rpm-build.patch. --- 00163-disable-parts-of-test_socket-in-rpm-build.patch | 11 ----------- python3.spec | 7 ------- 2 files changed, 18 deletions(-) delete mode 100644 00163-disable-parts-of-test_socket-in-rpm-build.patch diff --git a/00163-disable-parts-of-test_socket-in-rpm-build.patch b/00163-disable-parts-of-test_socket-in-rpm-build.patch deleted file mode 100644 index 0e28036..0000000 --- a/00163-disable-parts-of-test_socket-in-rpm-build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up Python-3.3.0b1/Lib/test/test_socket.py.disable-test_socket-in-rpm-builds Python-3.3.0b1/Lib/test/test_socket.py ---- Python-3.3.0b1/Lib/test/test_socket.py.disable-test_socket-in-rpm-builds 2012-07-24 15:02:30.823355067 -0400 -+++ Python-3.3.0b1/Lib/test/test_socket.py 2012-07-24 15:08:13.021354999 -0400 -@@ -2188,6 +2188,7 @@ class RecvmsgGenericStreamTests(RecvmsgG - # Tests which require a stream socket and can use either recvmsg() - # or recvmsg_into(). - -+ @unittest._skipInRpmBuild('fails intermittently when run within Koji') - def testRecvmsgEOF(self): - # Receive end-of-stream indicator (b"", peer socket closed). - msg, ancdata, flags, addr = self.doRecvmsg(self.serv_sock, 1024) diff --git a/python3.spec b/python3.spec index 6220933..fa16f24 100644 --- a/python3.spec +++ b/python3.spec @@ -258,12 +258,6 @@ Patch155: 00155-avoid-ctypes-thunks.patch # Not yet sent upstream Patch160: 00160-disable-test_fs_holes-in-rpm-build.patch -# 00163 # -# Some tests within test_socket fail intermittently when run inside Koji; -# disable them using unittest._skipInRpmBuild -# Not yet sent upstream -Patch163: 00163-disable-parts-of-test_socket-in-rpm-build.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 @@ -599,7 +593,6 @@ rm -r Modules/expat %patch132 -p1 %patch155 -p1 %patch160 -p1 -%patch163 -p1 %patch170 -p1 %patch178 -p1