bpo-40275: Use new test.support helper submodules in tests (GH-21727)

This commit is contained in:
Hai Shi 2020-08-04 23:53:12 +08:00 committed by GitHub
parent 604bba1f8f
commit c7decc27d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 58 additions and 46 deletions

View file

@ -3,6 +3,7 @@ import subprocess
import sys
import unittest
from test import support
from test.support import os_helper
from test.test_tools import scriptsdir, skip_if_missing
@ -14,7 +15,7 @@ class TestPathfixFunctional(unittest.TestCase):
script = os.path.join(scriptsdir, 'pathfix.py')
def setUp(self):
self.addCleanup(support.unlink, support.TESTFN)
self.addCleanup(os_helper.unlink, os_helper.TESTFN)
def pathfix(self, shebang, pathfix_flags, exitcode=0, stdout='', stderr='',
directory=''):
@ -24,7 +25,7 @@ class TestPathfixFunctional(unittest.TestCase):
filename = os.path.join(directory, 'script-A_1.py')
pathfix_arg = directory
else:
filename = support.TESTFN
filename = os_helper.TESTFN
pathfix_arg = filename
with open(filename, 'w', encoding='utf8') as f:
@ -56,8 +57,8 @@ class TestPathfixFunctional(unittest.TestCase):
return new_shebang
def test_recursive(self):
tmpdir = support.TESTFN + '.d'
self.addCleanup(support.rmtree, tmpdir)
tmpdir = os_helper.TESTFN + '.d'
self.addCleanup(os_helper.rmtree, tmpdir)
os.mkdir(tmpdir)
expected_stderr = f"recursedown('{os.path.basename(tmpdir)}')\n"
self.assertEqual(