From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 3 May 2017 01:47:34 +0000 (+0200)
Subject: bpo-30199: test_ssl closes all asyncore channels (#1381) (#1408)
X-Git-Tag: v2.7.14rc1~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c862ffa73b222746035155817d2516c4f5b71e;p=thirdparty%2FPython%2Fcpython.git

bpo-30199: test_ssl closes all asyncore channels (#1381) (#1408)

AsyncoreEchoServer of test_ssl now calls
asyncore.close_all(ignore_all=True) to ensure that
asyncore.socket_map is cleared once the test completes, even if
ConnectionHandler was not correctly unregistered.

Fix the following warning:

Warning -- asyncore.socket_map was modified by test_ssl
  Before: {}
  After:  {6: <test.test_ssl.AsyncoreEchoServer.EchoServer.ConnectionHandler>}
(cherry picked from commit 1dae7450c68bad498e57800387b24cb103c461fa)
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index a1258c65a576..2f98cf145508 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1955,6 +1955,8 @@ else:
             self.join()
             if support.verbose:
                 sys.stdout.write(" cleanup: successfully joined.\n")
+            # make sure that ConnectionHandler is removed from socket_map
+            asyncore.close_all(ignore_all=True)
 
         def start(self, flag=None):
             self.flag = flag