bpo-31233: socketserver.ThreadingMixIn.server_close() (#3523) · python/cpython@b8f4163 (original) (raw)

`@@ -1465,7 +1465,6 @@ def test_logger_disabling(self):

`

1465

1465

`self.assertFalse(logger.disabled)

`

1466

1466

``

1467

1467

``

1468

``

`-

@unittest.skipIf(True, "FIXME: bpo-30830")

`

1469

1468

`class SocketHandlerTest(BaseTest):

`

1470

1469

``

1471

1470

`"""Test for SocketHandler objects."""

`

`@@ -1502,11 +1501,11 @@ def setUp(self):

`

1502

1501

`def tearDown(self):

`

1503

1502

`"""Shutdown the TCP server."""

`

1504

1503

`try:

`

1505

``

`-

if self.server:

`

1506

``

`-

self.server.stop(2.0)

`

1507

1504

`if self.sock_hdlr:

`

1508

1505

`self.root_logger.removeHandler(self.sock_hdlr)

`

1509

1506

`self.sock_hdlr.close()

`

``

1507

`+

if self.server:

`

``

1508

`+

self.server.stop(2.0)

`

1510

1509

`finally:

`

1511

1510

`BaseTest.tearDown(self)

`

1512

1511

``

`@@ -1563,7 +1562,6 @@ def _get_temp_domain_socket():

`

1563

1562

`os.remove(fn)

`

1564

1563

`return fn

`

1565

1564

``

1566

``

`-

@unittest.skipIf(True, "FIXME: bpo-30830")

`

1567

1565

`@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")

`

1568

1566

`class UnixSocketHandlerTest(SocketHandlerTest):

`

1569

1567

``

`@@ -1581,7 +1579,6 @@ def tearDown(self):

`

1581

1579

`SocketHandlerTest.tearDown(self)

`

1582

1580

`support.unlink(self.address)

`

1583

1581

``

1584

``

`-

@unittest.skipIf(True, "FIXME: bpo-30830")

`

1585

1582

`class DatagramHandlerTest(BaseTest):

`

1586

1583

``

1587

1584

`"""Test for DatagramHandler."""

`

`@@ -1646,7 +1643,6 @@ def test_output(self):

`

1646

1643

`self.handled.wait()

`

1647

1644

`self.assertEqual(self.log_output, "spam\neggs\n")

`

1648

1645

``

1649

``

`-

@unittest.skipIf(True, "FIXME: bpo-30830")

`

1650

1646

`@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")

`

1651

1647

`class UnixDatagramHandlerTest(DatagramHandlerTest):

`

1652

1648

``

`@@ -1731,7 +1727,6 @@ def test_output(self):

`

1731

1727

`self.handled.wait()

`

1732

1728

`self.assertEqual(self.log_output, b'<11>h\xc3\xa4m-sp\xc3\xa4m')

`

1733

1729

``

1734

``

`-

@unittest.skipIf(True, "FIXME: bpo-30830")

`

1735

1730

`@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")

`

1736

1731

`class UnixSysLogHandlerTest(SysLogHandlerTest):

`

1737

1732

``

`@@ -1749,7 +1744,6 @@ def tearDown(self):

`

1749

1744

`SysLogHandlerTest.tearDown(self)

`

1750

1745

`support.unlink(self.address)

`

1751

1746

``

1752

``

`-

@unittest.skipIf(True, "FIXME: bpo-30830")

`

1753

1747

`@unittest.skipUnless(support.IPV6_ENABLED,

`

1754

1748

`'IPv6 support required for this test.')

`

1755

1749

`class IPv6SysLogHandlerTest(SysLogHandlerTest):

`

`@@ -2872,9 +2866,6 @@ def test_config14_ok(self):

`

2872

2866

`logging.warning('Exclamation')

`

2873

2867

`self.assertTrue(output.getvalue().endswith('Exclamation!\n'))

`

2874

2868

``

2875

``

`-

listen() uses ConfigSocketReceiver which is based

`

2876

``

`-

on socketserver.ThreadingTCPServer

`

2877

``

`-

@unittest.skipIf(True, "FIXME: bpo-30830")

`

2878

2869

`def setup_via_listener(self, text, verify=None):

`

2879

2870

`text = text.encode("utf-8")

`

2880

2871

`# Ask for a randomly assigned port (by using port 0)

`