bpo-32608: fixing errors with test_socketserver in a Windows environm…

…ent.

Lib/socketserver.py

@@ -204,7 +204,7 @@ def __init__(self, server_address, RequestHandlerClass):
         """Constructor.  May be extended, do not override."""
         self.server_address = server_address
         self.RequestHandlerClass = RequestHandlerClass
-        self.__is_shut_down = threading.Event()
+        self.__is_shut_down = multiprocessing.Event()
         self.__shutdown_request = False
 
     def server_activate(self):
@@ -674,9 +674,12 @@ def _wait_on_any_child(self, blocking):
                               if p.sentinel in joinable_sentinels]
 
         # Just need to join() one.
-        proc = joinable_processes[0]
-        proc.join()
-        return proc.pid
+        if joinable_processes:
+            proc = joinable_processes[0]
+            proc.join()
+            return proc.pid
+        else:
+            return None
 
     def _process_request_in_child(self, request, client_address):
         """Handles the actual request in the new child process."""

Lib/test/test_socketserver.py

@@ -70,6 +70,23 @@ def simple_subprocess(testcase):
         testcase.assertEqual(pid2, pid)
         testcase.assertEqual(72 << 8, status)
 
+class EchoingStreamRequestHandler(socketserver.StreamRequestHandler):
+    """Request Handler that echos back to the client the data it received."""
+    def handle(self):
+        line = self.rfile.readline()
+        self.wfile.write(line)
+
+class EchoingDatagramRequestHandler(socketserver.DatagramRequestHandler):
+    """Request Handler that echos back to the client the data it received."""
+    def handle(self):
+        line = self.rfile.readline()
+        self.wfile.write(line)
+
+def _handle_error(self, request, client_address):
+    """Handler that closes the client's connection, then raises an error."""
+    self.close_request(request)
+    raise
+
 class SocketServerTest(unittest.TestCase):
     """Test all socket servers."""
 
@@ -101,19 +118,10 @@ def pickaddr(self, proto):
             return fn
 
     def make_server(self, addr, svrcls, hdlrbase):
-        class MyServer(svrcls):
-            def handle_error(self, request, client_address):
-                self.close_request(request)
-                raise
-
-        class MyHandler(hdlrbase):
-            def handle(self):
-                line = self.rfile.readline()
-                self.wfile.write(line)
-
         if verbose: print("creating server")
         try:
-            server = MyServer(addr, MyHandler)
+            server = svrcls(addr, hdlrbase)
+            server.handle_error = _handle_error
         except PermissionError as e:
             # Issue 29184: cannot bind() a Unix socket on Android.
             self.skipTest('Cannot create server (%s, %s): %s' %
@@ -181,24 +189,24 @@ def dgram_examine(self, proto, addr):
 
     def test_TCPServer(self):
         self.run_server(socketserver.TCPServer,
-                        socketserver.StreamRequestHandler,
+                        EchoingStreamRequestHandler,
                         self.stream_examine)
 
     def test_ThreadingTCPServer(self):
         self.run_server(socketserver.ThreadingTCPServer,
-                        socketserver.StreamRequestHandler,
+                        EchoingStreamRequestHandler,
                         self.stream_examine)
 
     @requires_forking
     def test_ForkingTCPServer(self):
         with simple_subprocess(self):
             self.run_server(socketserver.ForkingTCPServer,
-                            socketserver.StreamRequestHandler,
+                            EchoingStreamRequestHandler,
                             self.stream_examine)
 
     def test_ProcessingTCPServer(self):
         self.run_server(socketserver.ProcessingTCPServer,
-                        socketserver.StreamRequestHandler,
+                        EchoingStreamRequestHandler,
                         self.stream_examine)
 
     @requires_unix_sockets
@@ -223,12 +231,12 @@ def test_ForkingUnixStreamServer(self):
 
     def test_UDPServer(self):
         self.run_server(socketserver.UDPServer,
-                        socketserver.DatagramRequestHandler,
+                        EchoingDatagramRequestHandler,
                         self.dgram_examine)
 
     def test_ThreadingUDPServer(self):
         self.run_server(socketserver.ThreadingUDPServer,
-                        socketserver.DatagramRequestHandler,
+                        EchoingDatagramRequestHandler,
                         self.dgram_examine)
 
     @requires_forking
@@ -240,7 +248,7 @@ def test_ForkingUDPServer(self):
 
     def test_ProcessingUDPServer(self):
         self.run_server(socketserver.ProcessingUDPServer,
-                        socketserver.DatagramRequestHandler,
+                        EchoingDatagramRequestHandler,
                         self.dgram_examine)
 
     @requires_unix_sockets