diff options
| author | Lembrun <amadeusk7@free.fr> | 2021-03-01 20:23:02 +0100 |
|---|---|---|
| committer | Lembrun <amadeusk7@free.fr> | 2021-03-01 20:23:02 +0100 |
| commit | 858ac241c57e16b02d2f62cef03213b563ff87be (patch) | |
| tree | 4fed061ce97f53594ab6b955f7f978481a0c21cb /tests | |
| parent | f767188abfaad6b5d798c93297e0fe2ac0e3486c (diff) | |
| parent | 5a62c73d0719a063c5fc74271f737ddf42ce49f3 (diff) | |
| download | qutebrowser-858ac241c57e16b02d2f62cef03213b563ff87be.tar.gz qutebrowser-858ac241c57e16b02d2f62cef03213b563ff87be.zip | |
Merge remote-tracking branch 'upstream/master' into qbot-snake-case
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/misc/test_editor.py | 5 | ||||
| -rw-r--r-- | tests/unit/misc/test_ipc.py | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py index d27c2f885..ee167e8bb 100644 --- a/tests/unit/misc/test_editor.py +++ b/tests/unit/misc/test_editor.py @@ -223,12 +223,13 @@ def _update_file(filename, contents): This might write the file multiple times, but different systems have different mtime's, so we can't be sure how long to wait otherwise. """ - old_mtime = new_mtime = os.stat(filename).st_mtime + file_path = pathlib.Path(filename) + old_mtime = new_mtime = file_path.stat().st_mtime while old_mtime == new_mtime: time.sleep(0.1) with open(filename, 'w', encoding='utf-8') as f: f.write(contents) - new_mtime = os.stat(filename).st_mtime + new_mtime = file_path.stat().st_mtime def test_modify_watch(qtbot): diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py index fe32f3976..c19d0bc42 100644 --- a/tests/unit/misc/test_ipc.py +++ b/tests/unit/misc/test_ipc.py @@ -306,10 +306,10 @@ class TestListen: @pytest.mark.posix def test_permissions_posix(self, ipc_server): ipc_server.listen() - sockfile = ipc_server._server.fullServerName() - sockdir = pathlib.Path(sockfile).parent + sockfile_path = pathlib.Path(ipc_server._server.fullServerName()) + sockdir = sockfile_path.parent - file_stat = os.stat(sockfile) + file_stat = sockfile_path.stat() dir_stat = sockdir.stat() # pylint: disable=no-member,useless-suppression @@ -322,7 +322,7 @@ class TestListen: print('sockdir: {} / owner {} / mode {:o}'.format( sockdir, dir_stat.st_uid, dir_stat.st_mode)) print('sockfile: {} / owner {} / mode {:o}'.format( - sockfile, file_stat.st_uid, file_stat.st_mode)) + sockfile_path, file_stat.st_uid, file_stat.st_mode)) assert file_owner_ok or dir_owner_ok assert file_mode_ok or dir_mode_ok @@ -331,7 +331,9 @@ class TestListen: def test_atime_update(self, qtbot, ipc_server): ipc_server._atime_timer.setInterval(500) # We don't want to wait ipc_server.listen() - old_atime = os.stat(ipc_server._server.fullServerName()).st_atime_ns + + sockfile_path = pathlib.Path(ipc_server._server.fullServerName()) + old_atime = sockfile_path.stat().st_atime_ns with qtbot.wait_signal(ipc_server._atime_timer.timeout, timeout=2000): pass @@ -340,7 +342,7 @@ class TestListen: with qtbot.wait_signal(ipc_server._atime_timer.timeout, timeout=2000): pass - new_atime = os.stat(ipc_server._server.fullServerName()).st_atime_ns + new_atime = sockfile_path.stat().st_atime_ns assert old_atime != new_atime |