Replace tmpdir fixture with tmp_path in tests (#3551) (#3553)

tests/conftest.py

@@ -1,26 +1,13 @@
 import hashlib
-import pathlib
 import platform
-import shutil
 import ssl
-import tempfile
 
 import pytest
 import trustme
 
 pytest_plugins = ['aiohttp.pytest_plugin', 'pytester']
 
 
-@pytest.fixture
-def shorttmpdir():
-    """Provides a temporary directory with a shorter file system path than the
-    tmpdir fixture.
-    """
-    tmpdir = pathlib.Path(tempfile.mkdtemp())
-    yield tmpdir
-    shutil.rmtree(tmpdir, ignore_errors=True)
-
-
 @pytest.fixture
 def tls_certificate_authority():
     if (platform.system() == 'Linux' and

tests/test_connector.py

@@ -43,8 +43,8 @@ def ssl_key():
 
 
 @pytest.fixture
-def unix_sockname(shorttmpdir):
-    sock_path = shorttmpdir / 'socket.sock'
+def unix_sockname(tmpdir):
+    sock_path = tmpdir / 'socket.sock'
     return str(sock_path)
 
 

tests/test_run_app.py

@@ -353,10 +353,10 @@ def test_run_app_custom_backlog_unix(patched_loop) -> None:
 
 
 @skip_if_no_unix_socks
-def test_run_app_http_unix_socket(patched_loop, shorttmpdir) -> None:
+def test_run_app_http_unix_socket(patched_loop, tmpdir) -> None:
     app = web.Application()
 
-    sock_path = str(shorttmpdir / 'socket.sock')
+    sock_path = str(tmpdir / 'socket.sock')
     printer = mock.Mock(wraps=stopper(patched_loop))
     web.run_app(app, path=sock_path, print=printer)
 
@@ -366,10 +366,10 @@ def test_run_app_http_unix_socket(patched_loop, shorttmpdir) -> None:
 
 
 @skip_if_no_unix_socks
-def test_run_app_https_unix_socket(patched_loop, shorttmpdir) -> None:
+def test_run_app_https_unix_socket(patched_loop, tmpdir) -> None:
     app = web.Application()
 
-    sock_path = str(shorttmpdir / 'socket.sock')
+    sock_path = str(tmpdir / 'socket.sock')
     ssl_context = ssl.create_default_context()
     printer = mock.Mock(wraps=stopper(patched_loop))
     web.run_app(app, path=sock_path, ssl_context=ssl_context, print=printer)

tests/test_web_runner.py

@@ -102,13 +102,13 @@ def test_non_app() -> None:
 
 @pytest.mark.skipif(platform.system() == "Windows",
                     reason="Unix socket support is required")
-async def test_addresses(make_runner, shorttmpdir) -> None:
+async def test_addresses(make_runner, tmpdir) -> None:
     _sock = get_unused_port_socket('127.0.0.1')
     runner = make_runner()
     await runner.setup()
     tcp = web.SockSite(runner, _sock)
     await tcp.start()
-    path = str(shorttmpdir / 'tmp.sock')
+    path = str(tmpdir / 'tmp.sock')
     unix = web.UnixSite(runner, path)
     await unix.start()
     actual_addrs = runner.addresses