Fix tests on macOS 10.13 (something seems different about the dual IPv4/6 stack setup)

CHANGES.rst

@@ -51,6 +51,9 @@
   an encoding has been specified. Initial patch in :pr:`939` by
   William Grzybowski.
 
+- Monkey-patching after the :mod:`ssl` module has been imported now
+  prints a warning because this can produce ``RecursionError``.
+
 1.2.2 (2017-06-05)
 ==================
 

src/gevent/socket.py

@@ -15,6 +15,7 @@ as well as the constants from the :mod:`socket` module are imported into this mo
 
 import sys
 from gevent._compat import PY3
+from gevent._compat import reraise
 from gevent._util import copy_globals
 
 
@@ -74,6 +75,7 @@ def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT, source_address=N
 
     host, port = address
     err = None
+    tb = None
     for res in getaddrinfo(host, port, 0 if has_ipv6 else AF_INET, SOCK_STREAM):
         af, socktype, proto, _, sa = res
         sock = None
@@ -90,13 +92,19 @@ def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT, source_address=N
             # and the next bind() fails (see test__socket.TestCreateConnection)
             # that does not happen with regular sockets though, because _socket.socket.connect() is a built-in.
             # this is similar to "getnameinfo loses a reference" failure in test_socket.py
+            tb = sys.exc_info()[2]
             if not PY3:
                 sys.exc_clear() # pylint:disable=no-member,useless-suppression
             if sock is not None:
                 sock.close()
             err = ex
+            sock = None
     if err is not None:
-        raise err # pylint:disable=raising-bad-type
+        try:
+            reraise(type(err), err, tb) # pylint:disable=raising-bad-type
+        finally:
+            err = None
+            tb = None
     else:
         raise error("getaddrinfo returns an empty list")
 

src/greentest/patched_tests_setup.py

@@ -677,12 +677,14 @@ if sys.version_info[:2] >= (3, 6):
 #         'test_socketserver.SocketServerTest.test_ForkingUDPServer',
 #         'test_socketserver.SocketServerTest.test_ForkingUnixStreamServer'])
 
-# LibreSSL reports OPENSSL_VERSION_INFO (2, 0, 0, 0, 0) regardless its version
-from ssl import OPENSSL_VERSION
-if OPENSSL_VERSION.startswith('LibreSSL'):
-    disabled_tests += [
-        'test_ssl.BasicSocketTests.test_openssl_version'
-    ]
+# LibreSSL reports OPENSSL_VERSION_INFO (2, 0, 0, 0, 0) regardless of its version,
+# so this is known to fail on some distros. We don't want to detect this because we
+# don't want to trigger the side-effects of importing ssl prematurely if we will
+# be monkey-patching, so we skip this test everywhere. It doesn't do much for us
+# anyway.
+disabled_tests += [
+    'test_ssl.BasicSocketTests.test_openssl_version'
+]
 
 # Now build up the data structure we'll use to actually find disabled tests
 # to avoid a linear scan for every file (it seems the list could get quite large)

src/greentest/test__monkey.py

@@ -46,10 +46,10 @@ for k, v in monkey.saved.items():
 
 import warnings
 with warnings.catch_warnings(record=True) as issued_warnings:
-    # Patch again, triggering two warnings, on for os=False/signal=True,
-    # one for repeated monkey-patching.
+    # Patch again, triggering three warnings, one for os=False/signal=True,
+    # one for repeated monkey-patching, one for patching after ssl
     monkey.patch_all(os=False)
-    assert len(issued_warnings) == 2, len(issued_warnings)
+    assert len(issued_warnings) == 3, [str(x) for x in issued_warnings]
     assert 'SIGCHLD' in str(issued_warnings[-1].message), issued_warnings[-1]
     assert 'more than once' in str(issued_warnings[0].message), issued_warnings[0]
 
@@ -59,7 +59,7 @@ with warnings.catch_warnings(record=True) as issued_warnings:
     monkey.patch_all(os=False)
     orig_saved['_gevent_saved_patch_all'] = monkey.saved['_gevent_saved_patch_all']
 
-    assert len(issued_warnings) == 0, len(issued_warnings)
+    assert not issued_warnings, [str(x) for x in issued_warnings]
 
 # Make sure that re-patching did not change the monkey.saved
 # attribute, overwriting the original functions.

src/greentest/test__pywsgi.py

@@ -242,6 +242,14 @@ class TestCase(greentest.TestCase):
     validator = staticmethod(validator)
     application = None
 
+    # Bind to default address, which should give us ipv6 (when available)
+    # and ipv4. (see self.connect())
+    listen_addr = ''
+    # connect on ipv4, even though we bound to ipv6 too
+    # to prove ipv4 works...except on Windows, it apparently doesn't.
+    # So use the hostname.
+    connect_addr = 'localhost'
+
     def init_logger(self):
         import logging
         logger = logging.getLogger('gevent.pywsgi')
@@ -249,9 +257,7 @@ class TestCase(greentest.TestCase):
 
     def init_server(self, application):
         logger = self.logger = self.init_logger()
-        # Bind to default address, which should give us ipv6 (when available)
-        # and ipv4. (see self.connect())
-        self.server = pywsgi.WSGIServer(('', 0), application,
+        self.server = pywsgi.WSGIServer((self.listen_addr, 0), application,
                                         log=logger, error_log=logger)
 
     def setUp(self):
@@ -284,10 +290,7 @@ class TestCase(greentest.TestCase):
         # XXX currently listening socket is kept open in gevent.wsgi
 
     def connect(self):
-        # connect on ipv4, even though we bound to ipv6 too
-        # to prove ipv4 works...except on Windows, it apparently doesn't.
-        # So use the hostname.
-        conn = socket.create_connection(('localhost', self.port))
+        conn = socket.create_connection((self.connect_addr, self.port))
         self.connected.append(weakref.ref(conn))
         result = conn
         if PY3:
@@ -718,7 +721,8 @@ class HttpsTestCase(TestCase):
     keyfile = os.path.join(os.path.dirname(__file__), 'test_server.key')
 
     def init_server(self, application):
-        self.server = pywsgi.WSGIServer(('127.0.0.1', 0), application, certfile=self.certfile, keyfile=self.keyfile)
+        self.server = pywsgi.WSGIServer((self.listen_addr, 0), application,
+                                        certfile=self.certfile, keyfile=self.keyfile)
 
     def urlopen(self, method='GET', post_body=None, **kwargs):
         import ssl
@@ -760,7 +764,8 @@ else:
             from gevent.ssl import _create_unverified_context
             context = _create_unverified_context()
             context.load_cert_chain(certfile=self.certfile, keyfile=self.keyfile)
-            self.server = pywsgi.WSGIServer(('127.0.0.1', 0), application, ssl_context=context)
+            self.server = pywsgi.WSGIServer((self.listen_addr, 0),
+                                            application, ssl_context=context)
 
 class TestHttps(HttpsTestCase):
 
@@ -1422,7 +1427,7 @@ class Handler(pywsgi.WSGIHandler):
             return data + self.rfile.readline()
 
 
-class TestSubclass1(TestCase):
+class TestHandlerSubclass(TestCase):
 
     validator = None
 
@@ -1431,7 +1436,9 @@ class TestSubclass1(TestCase):
         return []
 
     def init_server(self, application):
-        self.server = pywsgi.WSGIServer(('127.0.0.1', 0), application, handler_class=Handler)
+        self.server = pywsgi.WSGIServer((self.listen_addr, 0),
+                                        application,
+                                        handler_class=Handler)
 
     def test(self):
         fd = self.makefile()

src/greentest/test__threading_monkey_in_thread.py

@@ -34,8 +34,8 @@ class Test(greentest.TestCase):
         thread.start()
         thread.join()
 
-        self.assertFalse(isinstance(current, threading._DummyThread))
-        self.assertTrue(isinstance(current, monkey.get_original('threading', 'Thread')))
+        self.assertNotIsInstance(current, threading._DummyThread)
+        self.assertIsInstance(current, monkey.get_original('threading', 'Thread'))
 
 
         # We generated some warnings