From: Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) <greg@krypto.org>
Date: Fri, 3 Jun 2016 05:26:14 +0000 (+0000)
Subject: Issue25931: fix tests broken by the conditional define of socketserver.Forking*
X-Git-Tag: v3.6.0a2~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a945969d717dc8fcb5ca22691f98198b5173b740;p=thirdparty%2FPython%2Fcpython.git

Issue25931: fix tests broken by the conditional define of socketserver.Forking*
---

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 01ac12b949eb..9a907292aa74 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -44,7 +44,7 @@ def receive(sock, n, timeout=20):
     else:
         raise RuntimeError("timed out on %r" % (sock,))
 
-if HAVE_UNIX_SOCKETS:
+if HAVE_UNIX_SOCKETS and HAVE_FORKING:
     class ForkingUnixStreamServer(socketserver.ForkingMixIn,
                                   socketserver.UnixStreamServer):
         pass
@@ -368,11 +368,12 @@ class ThreadingErrorTestServer(socketserver.ThreadingMixIn,
         self.done.wait()
 
 
-class ForkingErrorTestServer(socketserver.ForkingMixIn, BaseErrorTestServer):
-    def wait_done(self):
-        [child] = self.active_children
-        os.waitpid(child, 0)
-        self.active_children.clear()
+if HAVE_FORKING:
+    class ForkingErrorTestServer(socketserver.ForkingMixIn, BaseErrorTestServer):
+        def wait_done(self):
+            [child] = self.active_children
+            os.waitpid(child, 0)
+            self.active_children.clear()
 
 
 class MiscTestCase(unittest.TestCase):