bpo-40275: Use new test.support helper submodules in tests (pythonGH-21743)

Author: shihai1991

Lib/test/test_dbm_gnu.py

@@ -3,7 +3,7 @@
 gdbm = import_helper.import_module("dbm.gnu") #skip if not supported
 import unittest
 import os
-from test.support import TESTFN, TESTFN_NONASCII, unlink
+from test.support.os_helper import TESTFN, TESTFN_NONASCII, unlink
 
 
 filename = TESTFN

Lib/test/test_faulthandler.py

@@ -7,6 +7,7 @@
 import sys
 import sysconfig
 from test import support
+from test.support import os_helper
 from test.support import script_helper, is_android
 import tempfile
 import unittest
@@ -51,7 +52,7 @@ def temporary_filename():
  try:
  yield filename
  finally:
- support.unlink(filename)
+ os_helper.unlink(filename)
 
 class FaultHandlerTests(unittest.TestCase):
  def get_output(self, code, filename=None, fd=None):

Lib/test/test_grp.py

@@ -1,9 +1,10 @@
 """Test script for the grp module."""
 
 import unittest
-from test import support
+from test.support import import_helper
 
-grp = support.import_module('grp')
+
+grp = import_helper.import_module('grp')
 
 class GroupDatabaseTestCase(unittest.TestCase):
 

Lib/test/test_http_cookiejar.py

@@ -3,6 +3,8 @@
 import os
 import re
 import test.support
+from test.support import os_helper
+from test.support import warnings_helper
 import time
 import unittest
 import urllib.request
@@ -328,12 +330,12 @@ def _interact(cookiejar, url, set_cookie_hdrs, hdr_name):
 
 class FileCookieJarTests(unittest.TestCase):
  def test_constructor_with_str(self):
- filename = test.support.TESTFN
+ filename = os_helper.TESTFN
  c = LWPCookieJar(filename)
  self.assertEqual(c.filename, filename)
 
  def test_constructor_with_path_like(self):
- filename = pathlib.Path(test.support.TESTFN)
+ filename = pathlib.Path(os_helper.TESTFN)
  c = LWPCookieJar(filename)
  self.assertEqual(c.filename, os.fspath(filename))
 
@@ -353,7 +355,7 @@ class A:
 
  def test_lwp_valueless_cookie(self):
  # cookies with no value should be saved and loaded consistently
- filename = test.support.TESTFN
+ filename = os_helper.TESTFN
  c = LWPCookieJar()
  interact_netscape(c, "http://www.acme.com/", 'boo')
  self.assertEqual(c._cookies["www.acme.com"]["/"]["boo"].value, None)
@@ -368,7 +370,7 @@ def test_lwp_valueless_cookie(self):
 
  def test_bad_magic(self):
  # OSErrors (eg. file doesn't exist) are allowed to propagate
- filename = test.support.TESTFN
+ filename = os_helper.TESTFN
  for cookiejar_class in LWPCookieJar, MozillaCookieJar:
  c = cookiejar_class()
  try:
@@ -475,7 +477,7 @@ def test_domain_return_ok(self):
  def test_missing_value(self):
  # missing = sign in Cookie: header is regarded by Mozilla as a missing
  # name, and by http.cookiejar as a missing value
- filename = test.support.TESTFN
+ filename = os_helper.TESTFN
  c = MozillaCookieJar(filename)
  interact_netscape(c, "http://www.acme.com/", 'eggs')
  interact_netscape(c, "http://www.acme.com/", '"spam"; path=/foo/')
@@ -599,7 +601,7 @@ def test_expires(self):
  c = CookieJar()
  future = time2netscape(time.time()+3600)
 
- with test.support.check_no_warnings(self):
+ with warnings_helper.check_no_warnings(self):
  headers = [f"Set-Cookie: FOO=BAR; path=/; expires={future}"]
  req = urllib.request.Request("http://www.coyote.com/")
  res = FakeResponse(headers, "http://www.coyote.com/")
@@ -1713,7 +1715,7 @@ def test_rejection(self):
  self.assertEqual(len(c), 6)
 
  # save and restore
- filename = test.support.TESTFN
+ filename = os_helper.TESTFN
 
  try:
  c.save(filename, ignore_discard=True)
@@ -1753,7 +1755,7 @@ def test_mozilla(self):
  # Save / load Mozilla/Netscape cookie file format.
  year_plus_one = time.localtime()[0] + 1
 
- filename = test.support.TESTFN
+ filename = os_helper.TESTFN
 
  c = MozillaCookieJar(filename,
  policy=DefaultCookiePolicy(rfc2965=True))

Lib/test/test_httpservers.py

@@ -67,7 +67,7 @@ def stop(self):
 class BaseTestCase(unittest.TestCase):
  def setUp(self):
  self._threads = threading_helper.threading_setup()
- os.environ = support.EnvironmentVarGuard()
+ os.environ = os_helper.EnvironmentVarGuard()
  self.server_started = threading.Event()
  self.thread = TestServerThread(self, self.request_handler)
  self.thread.start()
@@ -621,7 +621,7 @@ def setUp(self):
  # The shebang line should be pure ASCII: use symlink if possible.
  # See issue #7668.
  self._pythonexe_symlink = None
- if support.can_symlink():
+ if os_helper.can_symlink():
  self.pythonexe = os.path.join(self.parent_dir, 'python')
  self._pythonexe_symlink = support.PythonSymlink(self.pythonexe).__enter__()
  else:

Lib/test/test_import/__init__.py

@@ -18,7 +18,6 @@
 import unittest
 from unittest import mock
 
-import test.support
 from test.support import os_helper
 from test.support import (is_jython, swap_attr, swap_item, cpython_only)
 from test.support.import_helper import (
@@ -480,7 +479,7 @@ def test_dll_dependency_import(self):
  os.path.dirname(pydname),
  "sqlite3{}.dll".format("_d" if "_d" in pydname else ""))
 
- with test.support.temp_dir() as tmp:
+ with os_helper.temp_dir() as tmp:
  tmp2 = os.path.join(tmp, "DLLs")
  os.mkdir(tmp2)
 

Lib/test/test_ntpath.py

@@ -285,7 +285,7 @@ def test_realpath_relative(self):
  def test_realpath_broken_symlinks(self):
  ABSTFN = ntpath.abspath(os_helper.TESTFN)
  os.mkdir(ABSTFN)
- self.addCleanup(support.rmtree, ABSTFN)
+ self.addCleanup(os_helper.rmtree, ABSTFN)
 
  with support.change_cwd(ABSTFN):
  os.mkdir("subdir")
@@ -427,9 +427,9 @@ def test_realpath_cwd(self):
  ABSTFN = ntpath.abspath(os_helper.TESTFN)
 
  os_helper.unlink(ABSTFN)
- support.rmtree(ABSTFN)
+ os_helper.rmtree(ABSTFN)
  os.mkdir(ABSTFN)
- self.addCleanup(support.rmtree, ABSTFN)
+ self.addCleanup(os_helper.rmtree, ABSTFN)
 
  test_dir_long = ntpath.join(ABSTFN, "MyVeryLongDirectoryName")
  os.mkdir(test_dir_long)

Lib/test/test_site.py

@@ -7,6 +7,7 @@
 import unittest
 import test.support
 from test import support
+from test.support import os_helper
 from test.support import socket_helper
 from test.support import captured_stderr
 from test.support.os_helper import TESTFN, EnvironmentVarGuard, change_cwd
@@ -601,7 +602,7 @@ class _pthFileTests(unittest.TestCase):
  def _create_underpth_exe(self, lines, exe_pth=True):
  import _winapi
  temp_dir = tempfile.mkdtemp()
- self.addCleanup(test.support.rmtree, temp_dir)
+ self.addCleanup(os_helper.rmtree, temp_dir)
  exe_file = os.path.join(temp_dir, os.path.split(sys.executable)[1])
  dll_src_file = _winapi.GetModuleFileName(sys.dllhandle)
  dll_file = os.path.join(temp_dir, os.path.split(dll_src_file)[1])

Lib/test/test_socketserver.py

@@ -15,6 +15,7 @@
 
 import test.support
 from test.support import reap_children, verbose
+from test.support import os_helper
 from test.support import socket_helper
 from test.support import threading_helper
 
@@ -299,7 +300,7 @@ class ErrorHandlerTest(unittest.TestCase):
  KeyboardInterrupt are not passed."""
 
  def tearDown(self):
- test.support.unlink(test.support.TESTFN)
+ os_helper.unlink(os_helper.TESTFN)
 
  def test_sync_handled(self):
  BaseErrorTestServer(ValueError)
@@ -329,7 +330,7 @@ def test_forking_not_handled(self):
  self.check_result(handled=False)
 
  def check_result(self, handled):
- with open(test.support.TESTFN) as log:
+ with open(os_helper.TESTFN) as log:
  expected = 'Handler called\n' + 'Error handled\n' * handled
  self.assertEqual(log.read(), expected)
 
@@ -347,7 +348,7 @@ def __init__(self, exception):
  self.wait_done()
 
  def handle_error(self, request, client_address):
- with open(test.support.TESTFN, 'a') as log:
+ with open(os_helper.TESTFN, 'a') as log:
  log.write('Error handled\n')
 
  def wait_done(self):
@@ -356,7 +357,7 @@ def wait_done(self):
 
 class BadHandler(socketserver.BaseRequestHandler):
  def handle(self):
- with open(test.support.TESTFN, 'a') as log:
+ with open(os_helper.TESTFN, 'a') as log:
  log.write('Handler called\n')
  raise self.server.exception('Test error')
 

Lib/test/test_statistics.py

@@ -15,10 +15,10 @@
 import sys
 import unittest
 from test import support
+from test.support import import_helper
 
 from decimal import Decimal
 from fractions import Fraction
-from test import support
 
 
 # Module to be tested.
@@ -179,8 +179,10 @@ class _DoNothing:
 # We prefer this for testing numeric values that may not be exactly equal,
 # and avoid using TestCase.assertAlmostEqual, because it sucks :-)
 
-py_statistics = support.import_fresh_module('statistics', blocked=['_statistics'])
-c_statistics = support.import_fresh_module('statistics', fresh=['_statistics'])
+py_statistics = import_helper.import_fresh_module('statistics',
+ blocked=['_statistics'])
+c_statistics = import_helper.import_fresh_module('statistics',
+ fresh=['_statistics'])
 
 
 class TestModules(unittest.TestCase):