Rely on tree builder and path objects. Ref #232.

distutils/tests/test_file_util.py

@@ -4,29 +4,28 @@
 import errno
 import unittest.mock as mock
 
+import jaraco.path
+import path
+import pytest
+
 from distutils.file_util import move_file, copy_file
 from distutils.tests import support
 from distutils.errors import DistutilsFileError
 from .py38compat import unlink
-import pytest
 
 
 @pytest.fixture(autouse=True)
 def stuff(request, monkeypatch, distutils_managed_tempdir):
     self = request.instance
-    tmp_dir = self.mkdtemp()
-    self.source = os.path.join(tmp_dir, 'f1')
-    self.target = os.path.join(tmp_dir, 'f2')
-    self.target_dir = os.path.join(tmp_dir, 'd1')
+    tmp_dir = path.Path(self.mkdtemp())
+    self.source = tmp_dir / 'f1'
+    self.target = tmp_dir / 'f2'
+    self.target_dir = tmp_dir / 'd1'
 
 
 class TestFileUtil(support.TempdirManager):
     def test_move_file_verbosity(self, caplog):
-        f = open(self.source, 'w')
-        try:
-            f.write('some content')
-        finally:
-            f.close()
+        jaraco.path.build({self.source: 'some content'})
 
         move_file(self.source, self.target, verbose=0)
         assert not caplog.messages
@@ -53,8 +52,7 @@ def test_move_file_exception_unpacking_rename(self):
         with mock.patch("os.rename", side_effect=OSError("wrong", 1)), pytest.raises(
             DistutilsFileError
         ):
-            with open(self.source, 'w') as fobj:
-                fobj.write('spam eggs')
+            jaraco.path.build({self.source: 'spam eggs'})
             move_file(self.source, self.target, verbose=0)
 
     def test_move_file_exception_unpacking_unlink(self):
@@ -64,36 +62,32 @@ def test_move_file_exception_unpacking_unlink(self):
         ), mock.patch("os.unlink", side_effect=OSError("wrong", 1)), pytest.raises(
             DistutilsFileError
         ):
-            with open(self.source, 'w') as fobj:
-                fobj.write('spam eggs')
+            jaraco.path.build({self.source: 'spam eggs'})
             move_file(self.source, self.target, verbose=0)
 
     def test_copy_file_hard_link(self):
-        with open(self.source, 'w') as f:
-            f.write('some content')
+        jaraco.path.build({self.source: 'some content'})
         # Check first that copy_file() will not fall back on copying the file
         # instead of creating the hard link.
         try:
-            os.link(self.source, self.target)
+            self.source.link(self.target)
         except OSError as e:
             self.skipTest('os.link: %s' % e)
         else:
-            unlink(self.target)
+            self.target.unlink()
         st = os.stat(self.source)
         copy_file(self.source, self.target, link='hard')
         st2 = os.stat(self.source)
         st3 = os.stat(self.target)
         assert os.path.samestat(st, st2), (st, st2)
         assert os.path.samestat(st2, st3), (st2, st3)
-        with open(self.source) as f:
-            assert f.read() == 'some content'
+        assert self.source.read_text(encoding='utf-8') == 'some content'
 
     def test_copy_file_hard_link_failure(self):
         # If hard linking fails, copy_file() falls back on copying file
         # (some special filesystems don't support hard linking even under
         #  Unix, see issue #8876).
-        with open(self.source, 'w') as f:
-            f.write('some content')
+        jaraco.path.build({self.source: 'some content'})
         st = os.stat(self.source)
         with mock.patch("os.link", side_effect=OSError(0, "linking unsupported")):
             copy_file(self.source, self.target, link='hard')
@@ -102,5 +96,4 @@ def test_copy_file_hard_link_failure(self):
         assert os.path.samestat(st, st2), (st, st2)
         assert not os.path.samestat(st2, st3), (st2, st3)
         for fn in (self.source, self.target):
-            with open(fn) as f:
-                assert f.read() == 'some content'
+            assert fn.read_text(encoding='utf-8') == 'some content'