[pypy-commit] pypy py3.5-ssl: disable the importing of the _ssl module (not a builtin module anymore)

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: py3.5-ssl
Changeset: r88786:ef10bb6be703
Date: 2016-11-29 16:22 +0100
http://bitbucket.org/pypy/pypy/changeset/ef10bb6be703/

Log:	disable the importing of the _ssl module (not a builtin module
	anymore)

diff --git a/pypy/interpreter/test/test_appinterp.py b/pypy/interpreter/test/test_appinterp.py
--- a/pypy/interpreter/test/test_appinterp.py
+++ b/pypy/interpreter/test/test_appinterp.py
@@ -156,7 +156,7 @@
         assert space1.str_w(w_str) == "hello"
 
 class TestMixedModuleUnfreeze:
-    spaceconfig = dict(usemodules=('_ssl', '_socket'))
+    spaceconfig = dict(usemodules=('_socket',))
 
     def test_random_stuff_can_unfreeze(self):
         # When a module contains an "import" statement in applevel code, the
@@ -167,13 +167,13 @@
         # at runtime, like setting os.environ (posix module) or initializing
         # the winsock library (_socket module)
         w_socket = self.space.builtin_modules['_socket']
-        w_ssl = self.space.builtin_modules['_ssl']
+        # _ssl is not builtin anymore, this test also tried to _cleanup_ on
+        # the wrapped ssl object
+        # w_ssl = self.space.builtin_modules['_ssl']
 
         # Uncomment this line for a workaround
         # space.getattr(w_ssl, space.wrap('SSLError'))
 
         w_socket._cleanup_()
         assert w_socket.startup_called == False
-        w_ssl._cleanup_() # w_ssl.appleveldefs['SSLError'] imports _socket
-        assert w_socket.startup_called == False