Issue #5824: Fix DatagramRequestHandler tests by binding the client socket
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 2550290..d645d20 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -175,6 +175,8 @@
def dgram_examine(self, proto, addr):
s = socket.socket(proto, socket.SOCK_DGRAM)
+ if HAVE_UNIX_SOCKETS and proto == socket.AF_UNIX:
+ s.bind(self.pickaddr(proto))
s.sendto(TEST_STR, addr)
buf = data = receive(s, 100)
while data and '\n' not in buf:
@@ -269,27 +271,24 @@
# Make sure select was called again:
self.assertGreater(mock_select.called, 1)
- # Alas, on Linux (at least) recvfrom() doesn't return a meaningful
- # client address so this cannot work:
+ @requires_unix_sockets
+ def test_UnixDatagramServer(self):
+ self.run_server(SocketServer.UnixDatagramServer,
+ SocketServer.DatagramRequestHandler,
+ self.dgram_examine)
- # @requires_unix_sockets
- # def test_UnixDatagramServer(self):
- # self.run_server(SocketServer.UnixDatagramServer,
- # SocketServer.DatagramRequestHandler,
- # self.dgram_examine)
- #
- # @requires_unix_sockets
- # def test_ThreadingUnixDatagramServer(self):
- # self.run_server(SocketServer.ThreadingUnixDatagramServer,
- # SocketServer.DatagramRequestHandler,
- # self.dgram_examine)
- #
- # @requires_unix_sockets
- # @requires_forking
- # def test_ForkingUnixDatagramServer(self):
- # self.run_server(SocketServer.ForkingUnixDatagramServer,
- # SocketServer.DatagramRequestHandler,
- # self.dgram_examine)
+ @requires_unix_sockets
+ def test_ThreadingUnixDatagramServer(self):
+ self.run_server(SocketServer.ThreadingUnixDatagramServer,
+ SocketServer.DatagramRequestHandler,
+ self.dgram_examine)
+
+ @requires_unix_sockets
+ @requires_forking
+ def test_ForkingUnixDatagramServer(self):
+ self.run_server(ForkingUnixDatagramServer,
+ SocketServer.DatagramRequestHandler,
+ self.dgram_examine)
@reap_threads
def test_shutdown(self):