changeset:   101635:3145242bc81f
user:        Gregory P. Smith <greg@krypto.org> [Google Inc.]
date:        Fri Jun 03 05:26:14 2016 +0000
files:       Lib/test/test_socketserver.py
description:
Issue25931: fix tests broken by the conditional define of socketserver.Forking*


diff -r 9c8be3b89964 -r 3145242bc81f Lib/test/test_socketserver.py
--- a/Lib/test/test_socketserver.py	Fri Jun 03 00:57:26 2016 +0000
+++ b/Lib/test/test_socketserver.py	Fri Jun 03 05:26:14 2016 +0000
@@ -44,7 +44,7 @@
     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 @@
         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):