From e808c9d5c78e5a7a9d804eced013a02c0c7df1a5 Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Thu, 17 Mar 2022 19:45:40 -0700 Subject: [PATCH] [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. --- Lib/test/test_shutil.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 85cac94dfec7..3890df93bbcc 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -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): -- 2.47.3