[3.9] bpo-42782: fix broken shutil test (GH-31971)

We were using os_helper, which doesn't exist on 3.9. This wasn't
caught because the test is only run as root. I confirmed that when
run as root, the test previously failed and now passes.
This commit is contained in:
Jelle Zijlstra 2022-03-17 19:45:40 -07:00 committed by GitHub
parent 612019e60e
commit e808c9d5c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2154,7 +2154,7 @@ class TestMove(BaseTest, unittest.TestCase):
# Create a file and keep the directory immutable
os.lchflags(TESTFN_SRC, stat.UF_OPAQUE)
os_helper.create_empty_file(os.path.join(TESTFN_SRC, 'child'))
support.create_empty_file(os.path.join(TESTFN_SRC, 'child'))
os.lchflags(TESTFN_SRC, stat.SF_IMMUTABLE)
# Testing on a non-empty immutable directory
@ -2164,10 +2164,10 @@ class TestMove(BaseTest, unittest.TestCase):
finally:
if os.path.exists(TESTFN_SRC):
os.lchflags(TESTFN_SRC, stat.UF_OPAQUE)
os_helper.rmtree(TESTFN_SRC)
support.rmtree(TESTFN_SRC)
if os.path.exists(TESTFN_DST):
os.lchflags(TESTFN_DST, stat.UF_OPAQUE)
os_helper.rmtree(TESTFN_DST)
support.rmtree(TESTFN_DST)
class TestCopyFile(unittest.TestCase):