mirror of
https://github.com/python/cpython.git
synced 2025-12-04 00:30:19 +00:00
bpo-40275: Avoid importing socket in test.support (GH-19603)
* Move socket related functions from test.support to socket_helper. * Import socket, nntplib and urllib.error lazily in transient_internet(). * Remove importing multiprocess.
This commit is contained in:
parent
3c8a5b459d
commit
16994912c9
37 changed files with 472 additions and 429 deletions
|
|
@ -9,7 +9,7 @@ import sys
|
|||
import threading
|
||||
import unittest
|
||||
from unittest import mock
|
||||
from test import support
|
||||
from test.support import socket_helper
|
||||
try:
|
||||
import ssl
|
||||
except ImportError:
|
||||
|
|
@ -66,7 +66,7 @@ class StreamTests(test_utils.TestCase):
|
|||
loop=self.loop)
|
||||
self._basetest_open_connection(conn_fut)
|
||||
|
||||
@support.skip_unless_bind_unix_socket
|
||||
@socket_helper.skip_unless_bind_unix_socket
|
||||
def test_open_unix_connection(self):
|
||||
with test_utils.run_test_unix_server() as httpd:
|
||||
conn_fut = asyncio.open_unix_connection(httpd.address,
|
||||
|
|
@ -99,7 +99,7 @@ class StreamTests(test_utils.TestCase):
|
|||
|
||||
self._basetest_open_connection_no_loop_ssl(conn_fut)
|
||||
|
||||
@support.skip_unless_bind_unix_socket
|
||||
@socket_helper.skip_unless_bind_unix_socket
|
||||
@unittest.skipIf(ssl is None, 'No ssl module')
|
||||
def test_open_unix_connection_no_loop_ssl(self):
|
||||
with test_utils.run_test_unix_server(use_ssl=True) as httpd:
|
||||
|
|
@ -130,7 +130,7 @@ class StreamTests(test_utils.TestCase):
|
|||
loop=self.loop)
|
||||
self._basetest_open_connection_error(conn_fut)
|
||||
|
||||
@support.skip_unless_bind_unix_socket
|
||||
@socket_helper.skip_unless_bind_unix_socket
|
||||
def test_open_unix_connection_error(self):
|
||||
with test_utils.run_test_unix_server() as httpd:
|
||||
conn_fut = asyncio.open_unix_connection(httpd.address,
|
||||
|
|
@ -653,7 +653,7 @@ class StreamTests(test_utils.TestCase):
|
|||
|
||||
self.assertEqual(messages, [])
|
||||
|
||||
@support.skip_unless_bind_unix_socket
|
||||
@socket_helper.skip_unless_bind_unix_socket
|
||||
def test_start_unix_server(self):
|
||||
|
||||
class MyServer:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue