Revert "Merge pull request RustPython#3433 from deantvv/test-update"

This reverts commit 9fa5c5a, reversing
changes made to e7fa32c.

Author: youknowone

Lib/test/libregrtest/cmdline.py

@@ -2,7 +2,6 @@
 import os
 import sys
 from test import support
-from test.support import os_helper
 
 
 USAGE = """\
@@ -281,7 +280,7 @@ def _create_parser():
 def relative_filename(string):
     # CWD is replaced with a temporary dir before calling main(), so we
     # join it with the saved CWD so it ends up where the user expects.
-    return os.path.join(os_helper.SAVEDCWD, string)
+    return os.path.join(support.SAVEDCWD, string)
 
 
 def huntrleaks(string):

Lib/test/libregrtest/main.py

@@ -20,7 +20,6 @@
 from test.libregrtest.setup import setup_tests
 from test.libregrtest.utils import removepy, count, format_duration, printlist
 from test import support
-from test.support import os_helper
 
 
 # When tests are run from the Python build directory, it is best practice
@@ -200,7 +199,7 @@ def find_tests(self, tests):
             # regex to match 'test_builtin' in line:
             # '0:00:00 [  4/400] test_builtin -- test_dict took 1 sec'
             regex = re.compile(r'\btest_[a-zA-Z0-9_]+\b')
-            with open(os.path.join(os_helper.SAVEDCWD, self.ns.fromfile)) as fp:
+            with open(os.path.join(support.SAVEDCWD, self.ns.fromfile)) as fp:
                 for line in fp:
                     line = line.split('#', 1)[0]
                     line = line.strip()
@@ -543,7 +542,7 @@ def save_xml_result(self):
         for k, v in totals.items():
             root.set(k, str(v))
 
-        xmlpath = os.path.join(os_helper.SAVEDCWD, self.ns.xmlpath)
+        xmlpath = os.path.join(support.SAVEDCWD, self.ns.xmlpath)
         with open(xmlpath, 'wb') as f:
             for s in ET.tostringlist(root):
                 f.write(s)
@@ -569,8 +568,8 @@ def main(self, tests=None, **kwargs):
         # Run the tests in a context manager that temporarily changes the CWD to a
         # temporary and writable directory.  If it's not possible to create or
         # change the CWD, the original CWD will be used.  The original CWD is
-        # available from os_helper.SAVEDCWD.
-        with os_helper.temp_cwd(test_cwd, quiet=True):
+        # available from support.SAVEDCWD.
+        with support.temp_cwd(test_cwd, quiet=True):
             self._main(tests, kwargs)
 
     def getloadavg(self):

Lib/test/libregrtest/refleak.py

@@ -61,7 +61,7 @@ def get_pooled_int(value):
         return int_pool.setdefault(value, value)
 
     nwarmup, ntracked, fname = ns.huntrleaks
-    fname = os.path.join(os_helper.SAVEDCWD, fname)
+    fname = os.path.join(support.SAVEDCWD, fname)
     repcount = nwarmup + ntracked
 
     # Pre-allocate to ensure that the loop doesn't allocate anything new

Lib/test/libregrtest/runtest.py

@@ -11,7 +11,6 @@
 import unittest
 
 from test import support
-from test.support import os_helper
 from test.libregrtest.refleak import dash_R, clear_caches
 from test.libregrtest.save_env import saved_test_environment
 from test.libregrtest.utils import print_warning
@@ -299,7 +298,7 @@ def cleanup_test_droppings(test_name, verbose):
     # since if a test leaves a file open, it cannot be deleted by name (while
     # there's nothing we can do about that here either, we can display the
     # name of the offending test, which is a real help).
-    for name in (os_helper.TESTFN,
+    for name in (support.TESTFN,
                  "db_home",
                 ):
         if not os.path.exists(name):

Lib/test/libregrtest/runtest_mp.py

@@ -46,7 +46,7 @@ def run_test_in_subprocess(testname, ns):
                             stderr=subprocess.PIPE,
                             universal_newlines=True,
                             close_fds=(os.name != 'nt'),
-                            cwd=os_helper.SAVEDCWD)
+                            cwd=support.SAVEDCWD)
 
 
 def run_tests_worker(worker_args):

Lib/test/libregrtest/save_env.py

@@ -9,7 +9,6 @@
 import threading
 import warnings
 from test import support
-from test.support import os_helper
 from test.libregrtest.utils import print_warning
 try:
     import _multiprocessing, multiprocessing.process
@@ -229,12 +228,12 @@ def get_files(self):
         return sorted(fn + ('/' if os.path.isdir(fn) else '')
                       for fn in os.listdir())
     def restore_files(self, saved_value):
-        fn = os_helper.TESTFN
+        fn = support.TESTFN
         if fn not in saved_value and (fn + '/') not in saved_value:
             if os.path.isfile(fn):
-                os_helper.unlink(fn)
+                support.unlink(fn)
             elif os.path.isdir(fn):
-                os_helper.rmtree(fn)
+                support.rmtree(fn)
 
     _lc = [getattr(locale, lc) for lc in dir(locale)
            if lc.startswith('LC_')]

Lib/test/libregrtest/win_utils.py

@@ -55,7 +55,7 @@ def start(self):
 
         # Spawn off the load monitor
         command = ['typeperf', COUNTER_NAME, '-si', str(SAMPLING_INTERVAL)]
-        self.p = subprocess.Popen(command, stdout=command_stdout, cwd=os_helper.SAVEDCWD)
+        self.p = subprocess.Popen(command, stdout=command_stdout, cwd=support.SAVEDCWD)
 
         # Close our copy of the write end of the pipe
         os.close(command_stdout)

Lib/test/list_tests.py

@@ -8,7 +8,6 @@
 from functools import cmp_to_key
 
 from test import support, seq_tests
-from test.support import os_helper
 
 
 class CommonTest(seq_tests.CommonTest):
@@ -74,12 +73,12 @@ def test_print(self):
         d.append(d)
         d.append(400)
         try:
-            with open(os_helper.TESTFN, "w") as fo:
+            with open(support.TESTFN, "w") as fo:
                 fo.write(str(d))
-            with open(os_helper.TESTFN, "r") as fo:
+            with open(support.TESTFN, "r") as fo:
                 self.assertEqual(fo.read(), repr(d))
         finally:
-            os.remove(os_helper.TESTFN)
+            os.remove(support.TESTFN)
 
     def test_set_subscript(self):
         a = self.type2test(range(20))