Replaced os.path by pathlib in tests/unit/utils

1 files changed, 37 insertions, 29 deletions

diff --git a/tests/unit/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py
index c686e4f74..4dfb5d06d 100644
--- a/tests/unit/utils/test_qtutils.py
+++ b/tests/unit/utils/test_qtutils.py
@@ -22,7 +22,7 @@
 
 import io
 import os
-import os.path
+import pathlib
 import dataclasses
 import unittest
 import unittest.mock
@@ -436,37 +436,42 @@ class TestSavefileOpen:
     ## Tests with real files
 
     @pytest.mark.parametrize('data', ["Hello World", "Snowman! ☃"])
-    def test_utf8(self, data, tmpdir):
+    def test_utf8(self, data, tmp_path):
         """Test with UTF8 data."""
-        filename = tmpdir / 'foo'
-        filename.write("Old data")
+        filename = tmp_path / 'foo'
+        with filename.open('w', encoding='utf-8') as f:
+            filename.write_text("Old data")
         with qtutils.savefile_open(str(filename)) as f:
             f.write(data)
-        assert tmpdir.listdir() == [filename]
+        for x in tmp_path.iterdir():
+            assert x == filename
         assert filename.read_text(encoding='utf-8') == data
 
-    def test_binary(self, tmpdir):
+    def test_binary(self, tmp_path):
         """Test with binary data."""
-        filename = tmpdir / 'foo'
+        filename = tmp_path / 'foo'
         with qtutils.savefile_open(str(filename), binary=True) as f:
             f.write(b'\xde\xad\xbe\xef')
-        assert tmpdir.listdir() == [filename]
-        assert filename.read_binary() == b'\xde\xad\xbe\xef'
+        for x in tmp_path.iterdir():
+            assert x == filename
+        assert filename.read_bytes() == b'\xde\xad\xbe\xef'
 
-    def test_exception(self, tmpdir):
+    def test_exception(self, tmp_path):
         """Test with an exception in the block."""
-        filename = tmpdir / 'foo'
-        filename.write("Old content")
+        filename = tmp_path / 'foo'
+        with filename.open('w', encoding='utf-8') as f:
+            filename.write_text("Old content")
         with pytest.raises(SavefileTestException):
             with qtutils.savefile_open(str(filename)) as f:
                 f.write("Hello World!")
                 raise SavefileTestException
-        assert tmpdir.listdir() == [filename]
+        for x in tmp_path.iterdir():
+            assert x == filename
         assert filename.read_text(encoding='utf-8') == "Old content"
 
-    def test_existing_dir(self, tmpdir):
+    def test_existing_dir(self, tmp_path):
         """Test with the filename already occupied by a directory."""
-        filename = tmpdir / 'foo'
+        filename = tmp_path / 'foo'
         filename.mkdir()
         with pytest.raises(OSError) as excinfo:
             with qtutils.savefile_open(str(filename)):
@@ -474,37 +479,40 @@ class TestSavefileOpen:
 
         msg = "Filename refers to a directory: {!r}".format(str(filename))
         assert str(excinfo.value) == msg
-        assert tmpdir.listdir() == [filename]
+        for x in tmp_path.iterdir():
+            assert x == filename
 
-    def test_failing_flush(self, tmpdir):
+    def test_failing_flush(self, tmp_path):
         """Test with the file being closed before flushing."""
-        filename = tmpdir / 'foo'
+        filename = tmp_path / 'foo'
         with pytest.raises(ValueError, match="IO operation on closed device!"):
             with qtutils.savefile_open(str(filename), binary=True) as f:
                 f.write(b'Hello')
                 f.dev.commit()  # provoke failing flush
 
-        assert tmpdir.listdir() == [filename]
+        for x in tmp_path.iterdir():
+            assert x == filename
 
-    def test_failing_commit(self, tmpdir):
+    def test_failing_commit(self, tmp_path):
         """Test with the file being closed before committing."""
-        filename = tmpdir / 'foo'
+        filename = tmp_path / 'foo'
         with pytest.raises(OSError, match='Commit failed!'):
             with qtutils.savefile_open(str(filename), binary=True) as f:
                 f.write(b'Hello')
                 f.dev.cancelWriting()  # provoke failing commit
 
-        assert tmpdir.listdir() == []
+        for x in tmp_path.iterdir():
+            assert x == []
 
-    def test_line_endings(self, tmpdir):
+    def test_line_endings(self, tmp_path):
         """Make sure line endings are translated correctly.
 
         See https://github.com/qutebrowser/qutebrowser/issues/309
         """
-        filename = tmpdir / 'foo'
+        filename = tmp_path / 'foo'
         with qtutils.savefile_open(str(filename)) as f:
             f.write('foo\nbar\nbaz')
-        data = filename.read_binary()
+        data = filename.read_bytes()
         if utils.is_windows:
             assert data == b'foo\r\nbar\r\nbaz'
         else:
@@ -521,7 +529,7 @@ if test_file is not None:
         """Clean up the python testfile after tests if tests didn't."""
         yield
         try:
-            os.remove(test_file.TESTFN)
+            pathlib.Path(test_file.TESTFN).unlink()
         except FileNotFoundError:
             pass
 
@@ -682,9 +690,9 @@ class TestPyQIODevice:
         pyqiodev.write(data)
         assert len(pyqiodev) == len(data)
 
-    def test_failing_open(self, tmpdir):
+    def test_failing_open(self, tmp_path):
         """Test open() which fails (because it's an existent directory)."""
-        qf = QFile(str(tmpdir))
+        qf = QFile(str(tmp_path))
         dev = qtutils.PyQIODevice(qf)
         with pytest.raises(qtutils.QtOSError) as excinfo:
             dev.open(QIODevice.WriteOnly)
@@ -854,7 +862,7 @@ class TestPyQIODevice:
             pyqiodev_failing.write(b'x')
 
     @pytest.mark.posix
-    @pytest.mark.skipif(not os.path.exists('/dev/full'),
+    @pytest.mark.skipif(not pathlib.Path('/dev/full').exists(),
                         reason="Needs /dev/full.")
     def test_write_error_real(self):
         """Test a real write error with /dev/full on supported systems."""