bpo-31233: socketserver.ThreadingMixIn.server_close() (#3523) · python/cpython@b8f4163
@@ -1465,7 +1465,6 @@ def test_logger_disabling(self):
14651465self.assertFalse(logger.disabled)
14661466146714671468-@unittest.skipIf(True, "FIXME: bpo-30830")
14691468class SocketHandlerTest(BaseTest):
1470146914711470"""Test for SocketHandler objects."""
@@ -1502,11 +1501,11 @@ def setUp(self):
15021501def tearDown(self):
15031502"""Shutdown the TCP server."""
15041503try:
1505-if self.server:
1506-self.server.stop(2.0)
15071504if self.sock_hdlr:
15081505self.root_logger.removeHandler(self.sock_hdlr)
15091506self.sock_hdlr.close()
1507+if self.server:
1508+self.server.stop(2.0)
15101509finally:
15111510BaseTest.tearDown(self)
15121511@@ -1563,7 +1562,6 @@ def _get_temp_domain_socket():
15631562os.remove(fn)
15641563return fn
156515641566-@unittest.skipIf(True, "FIXME: bpo-30830")
15671565@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
15681566class UnixSocketHandlerTest(SocketHandlerTest):
15691567@@ -1581,7 +1579,6 @@ def tearDown(self):
15811579SocketHandlerTest.tearDown(self)
15821580support.unlink(self.address)
158315811584-@unittest.skipIf(True, "FIXME: bpo-30830")
15851582class DatagramHandlerTest(BaseTest):
1586158315871584"""Test for DatagramHandler."""
@@ -1646,7 +1643,6 @@ def test_output(self):
16461643self.handled.wait()
16471644self.assertEqual(self.log_output, "spam\neggs\n")
164816451649-@unittest.skipIf(True, "FIXME: bpo-30830")
16501646@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
16511647class UnixDatagramHandlerTest(DatagramHandlerTest):
16521648@@ -1731,7 +1727,6 @@ def test_output(self):
17311727self.handled.wait()
17321728self.assertEqual(self.log_output, b'<11>h\xc3\xa4m-sp\xc3\xa4m')
173317291734-@unittest.skipIf(True, "FIXME: bpo-30830")
17351730@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
17361731class UnixSysLogHandlerTest(SysLogHandlerTest):
17371732@@ -1749,7 +1744,6 @@ def tearDown(self):
17491744SysLogHandlerTest.tearDown(self)
17501745support.unlink(self.address)
175117461752-@unittest.skipIf(True, "FIXME: bpo-30830")
17531747@unittest.skipUnless(support.IPV6_ENABLED,
17541748 'IPv6 support required for this test.')
17551749class IPv6SysLogHandlerTest(SysLogHandlerTest):
@@ -2872,9 +2866,6 @@ def test_config14_ok(self):
28722866logging.warning('Exclamation')
28732867self.assertTrue(output.getvalue().endswith('Exclamation!\n'))
287428682875-# listen() uses ConfigSocketReceiver which is based
2876-# on socketserver.ThreadingTCPServer
2877-@unittest.skipIf(True, "FIXME: bpo-30830")
28782869def setup_via_listener(self, text, verify=None):
28792870text = text.encode("utf-8")
28802871# Ask for a randomly assigned port (by using port 0)