From 06a40d735939fd7d5cb77a68a6e18299b6484fa5 Mon Sep 17 00:00:00 2001 From: Hai Shi Date: Thu, 25 Jun 2020 20:15:40 +0800 Subject: [PATCH] bpo-40275: Use new test.support helper submodules in tests (GH-20824) --- Lib/test/support/socket_helper.py | 2 +- Lib/test/test_asyncio/__init__.py | 6 ++++-- Lib/test/test_asyncio/test_base_events.py | 9 +++++---- Lib/test/test_asyncio/test_sendfile.py | 7 ++++--- Lib/test/test_asyncio/test_subprocess.py | 7 ++++--- Lib/test/test_asyncio/test_unix_events.py | 8 ++++---- Lib/test/test_getopt.py | 3 ++- Lib/test/test_tcl.py | 3 ++- Lib/test/test_xmlrpc.py | 5 +++-- 9 files changed, 29 insertions(+), 21 deletions(-) diff --git a/Lib/test/support/socket_helper.py b/Lib/test/support/socket_helper.py index f709ffd40dd..7070c12c253 100644 --- a/Lib/test/support/socket_helper.py +++ b/Lib/test/support/socket_helper.py @@ -146,7 +146,7 @@ def skip_unless_bind_unix_socket(test): return unittest.skip('No UNIX Sockets')(test) global _bind_nix_socket_error if _bind_nix_socket_error is None: - from test.support import TESTFN, unlink + from .os_helper import TESTFN, unlink path = TESTFN + "can_bind_unix_socket" with socket.socket(socket.AF_UNIX) as sock: try: diff --git a/Lib/test/test_asyncio/__init__.py b/Lib/test/test_asyncio/__init__.py index c77c7a81278..5d415044d7d 100644 --- a/Lib/test/test_asyncio/__init__.py +++ b/Lib/test/test_asyncio/__init__.py @@ -1,8 +1,10 @@ import os -from test.support import load_package_tests, import_module +from test.support import load_package_tests +from test.support import import_helper + # Skip tests if we don't have concurrent.futures. -import_module('concurrent.futures') +import_helper.import_module('concurrent.futures') def load_tests(*args): return load_package_tests(os.path.dirname(__file__), *args) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py index 533d5cc7f50..f74dabc2db9 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -16,6 +16,7 @@ from asyncio import constants from test.test_asyncio import utils as test_utils from test import support from test.support.script_helper import assert_python_ok +from test.support import os_helper from test.support import socket_helper @@ -1983,14 +1984,14 @@ class BaseLoopSockSendfileTests(test_utils.TestCase): def setUpClass(cls): cls.__old_bufsize = constants.SENDFILE_FALLBACK_READBUFFER_SIZE constants.SENDFILE_FALLBACK_READBUFFER_SIZE = 1024 * 16 - with open(support.TESTFN, 'wb') as fp: + with open(os_helper.TESTFN, 'wb') as fp: fp.write(cls.DATA) super().setUpClass() @classmethod def tearDownClass(cls): constants.SENDFILE_FALLBACK_READBUFFER_SIZE = cls.__old_bufsize - support.unlink(support.TESTFN) + os_helper.unlink(os_helper.TESTFN) super().tearDownClass() def setUp(self): @@ -1998,7 +1999,7 @@ class BaseLoopSockSendfileTests(test_utils.TestCase): # BaseSelectorEventLoop() has no native implementation self.loop = BaseSelectorEventLoop() self.set_event_loop(self.loop) - self.file = open(support.TESTFN, 'rb') + self.file = open(os_helper.TESTFN, 'rb') self.addCleanup(self.file.close) super().setUp() @@ -2095,7 +2096,7 @@ class BaseLoopSockSendfileTests(test_utils.TestCase): def test_nonbinary_file(self): sock = self.make_socket() - with open(support.TESTFN, 'r') as f: + with open(os_helper.TESTFN, 'r') as f: with self.assertRaisesRegex(ValueError, "binary mode"): self.run_loop(self.loop.sock_sendfile(sock, f)) diff --git a/Lib/test/test_asyncio/test_sendfile.py b/Lib/test/test_asyncio/test_sendfile.py index dbce199a9b8..a30d9b9b4d9 100644 --- a/Lib/test/test_asyncio/test_sendfile.py +++ b/Lib/test/test_asyncio/test_sendfile.py @@ -10,6 +10,7 @@ from asyncio import base_events from asyncio import constants from unittest import mock from test import support +from test.support import os_helper from test.support import socket_helper from test.test_asyncio import utils as test_utils @@ -98,17 +99,17 @@ class SendfileBase: @classmethod def setUpClass(cls): - with open(support.TESTFN, 'wb') as fp: + with open(os_helper.TESTFN, 'wb') as fp: fp.write(cls.DATA) super().setUpClass() @classmethod def tearDownClass(cls): - support.unlink(support.TESTFN) + os_helper.unlink(os_helper.TESTFN) super().tearDownClass() def setUp(self): - self.file = open(support.TESTFN, 'rb') + self.file = open(os_helper.TESTFN, 'rb') self.addCleanup(self.file.close) self.loop = self.create_event_loop() self.set_event_loop(self.loop) diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index 6657a88e657..177a02cdcc1 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -10,6 +10,7 @@ from asyncio import base_subprocess from asyncio import subprocess from test.test_asyncio import utils as test_utils from test import support +from test.support import os_helper if sys.platform != 'win32': from asyncio import unix_events @@ -626,10 +627,10 @@ class SubprocessMixin: def test_create_subprocess_exec_with_path(self): async def execute(): p = await subprocess.create_subprocess_exec( - support.FakePath(sys.executable), '-c', 'pass') + os_helper.FakePath(sys.executable), '-c', 'pass') await p.wait() p = await subprocess.create_subprocess_exec( - sys.executable, '-c', 'pass', support.FakePath('.')) + sys.executable, '-c', 'pass', os_helper.FakePath('.')) await p.wait() self.assertIsNone(self.loop.run_until_complete(execute())) @@ -737,7 +738,7 @@ class GenericWatcherTests: with self.assertRaises(RuntimeError): await subprocess.create_subprocess_exec( - support.FakePath(sys.executable), '-c', 'pass') + os_helper.FakePath(sys.executable), '-c', 'pass') watcher.add_child_handler.assert_not_called() diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py index 10bd46dea19..2c7d52a15bb 100644 --- a/Lib/test/test_asyncio/test_unix_events.py +++ b/Lib/test/test_asyncio/test_unix_events.py @@ -14,7 +14,7 @@ import tempfile import threading import unittest from unittest import mock -from test import support +from test.support import os_helper from test.support import socket_helper if sys.platform == 'win32': @@ -467,19 +467,19 @@ class SelectorEventLoopUnixSockSendfileTests(test_utils.TestCase): @classmethod def setUpClass(cls): - with open(support.TESTFN, 'wb') as fp: + with open(os_helper.TESTFN, 'wb') as fp: fp.write(cls.DATA) super().setUpClass() @classmethod def tearDownClass(cls): - support.unlink(support.TESTFN) + os_helper.unlink(os_helper.TESTFN) super().tearDownClass() def setUp(self): self.loop = asyncio.new_event_loop() self.set_event_loop(self.loop) - self.file = open(support.TESTFN, 'rb') + self.file = open(os_helper.TESTFN, 'rb') self.addCleanup(self.file.close) super().setUp() diff --git a/Lib/test/test_getopt.py b/Lib/test/test_getopt.py index 9275dc4c5ba..9261276ebb9 100644 --- a/Lib/test/test_getopt.py +++ b/Lib/test/test_getopt.py @@ -1,7 +1,8 @@ # test_getopt.py # David Goodger 2000-08-19 -from test.support import verbose, run_doctest, EnvironmentVarGuard +from test.support import verbose, run_doctest +from test.support.os_helper import EnvironmentVarGuard import unittest import getopt diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index 1c5b9cf2bd2..db982dac8d6 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -5,9 +5,10 @@ import sys import os import warnings from test import support +from test.support import import_helper # Skip this test if the _tkinter module wasn't built. -_tkinter = support.import_module('_tkinter') +_tkinter = import_helper.import_module('_tkinter') import tkinter from tkinter import Tcl diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py index 79f702d0a75..3dfa84bf77d 100644 --- a/Lib/test/test_xmlrpc.py +++ b/Lib/test/test_xmlrpc.py @@ -15,6 +15,7 @@ import re import io import contextlib from test import support +from test.support import os_helper from test.support import socket_helper from test.support import threading_helper from test.support import ALWAYS_EQ, LARGEST, SMALLEST @@ -1372,7 +1373,7 @@ class CGIHandlerTestCase(unittest.TestCase): self.cgi = None def test_cgi_get(self): - with support.EnvironmentVarGuard() as env: + with os_helper.EnvironmentVarGuard() as env: env['REQUEST_METHOD'] = 'GET' # if the method is GET and no request_text is given, it runs handle_get # get sysout output @@ -1404,7 +1405,7 @@ class CGIHandlerTestCase(unittest.TestCase): """ - with support.EnvironmentVarGuard() as env, \ + with os_helper.EnvironmentVarGuard() as env, \ captured_stdout(encoding=self.cgi.encoding) as data_out, \ support.captured_stdin() as data_in: data_in.write(data)