Replace all tmpdir fixtures with tmp_path (#3551) (#3955)

tmp_path is the replacement fixture in pytest for tmpdir; tmp_path
uses the builtin pathlib.Path class. As it says on the tin, this
commit replaces every instance of tmpdir in the test suite with
tmp_path. Aside from s/tmpdir/tmp_path/ this also required changing
instances of `tmpdir.join(foo)` to `tmp_path / foo`.

This is intended to comprehensively address #3551 and should have
no side effects.

CHANGES/3551.misc

@@ -0,0 +1 @@
+Replace all tmpdir fixtures with tmp_path in test suite.

CONTRIBUTORS.txt

@@ -163,6 +163,7 @@ Martin Melka
 Martin Richard
 Mathias Fröjdman
 Mathieu Dugré
+Matt VanEseltine
 Matthieu Hauglustaine
 Matthieu Rigal
 Michael Ihnatenko

tests/test_client_request.py

@@ -655,8 +655,8 @@ async def test_pass_falsy_data(loop) -> None:
     await req.close()
 
 
-async def test_pass_falsy_data_file(loop, tmpdir) -> None:
-    testfile = tmpdir.join('tmpfile').open('w+b')
+async def test_pass_falsy_data_file(loop, tmp_path) -> None:
+    testfile = (tmp_path / 'tmpfile').open('w+b')
     testfile.write(b'data')
     testfile.seek(0)
     skip = frozenset([hdrs.CONTENT_TYPE])

tests/test_proxy_functional.py

@@ -530,11 +530,11 @@ async def test_proxy_from_env_http_with_auth(proxy_test_server,
 
 
 async def test_proxy_from_env_http_with_auth_from_netrc(
-        proxy_test_server, get_request, tmpdir, mocker):
+        proxy_test_server, get_request, tmp_path, mocker):
     url = 'http://aiohttp.io/path'
     proxy = await proxy_test_server()
     auth = aiohttp.BasicAuth('user', 'pass')
-    netrc_file = tmpdir.join('test_netrc')
+    netrc_file = tmp_path / 'test_netrc'
     netrc_file_data = 'machine 127.0.0.1 login %s password %s' % (
         auth.login, auth.password)
     with open(str(netrc_file), 'w') as f:
@@ -552,11 +552,11 @@ async def test_proxy_from_env_http_with_auth_from_netrc(
 
 
 async def test_proxy_from_env_http_without_auth_from_netrc(
-        proxy_test_server, get_request, tmpdir, mocker):
+        proxy_test_server, get_request, tmp_path, mocker):
     url = 'http://aiohttp.io/path'
     proxy = await proxy_test_server()
     auth = aiohttp.BasicAuth('user', 'pass')
-    netrc_file = tmpdir.join('test_netrc')
+    netrc_file = tmp_path / 'test_netrc'
     netrc_file_data = 'machine 127.0.0.2 login %s password %s' % (
         auth.login, auth.password)
     with open(str(netrc_file), 'w') as f:
@@ -574,11 +574,11 @@ async def test_proxy_from_env_http_without_auth_from_netrc(
 
 
 async def test_proxy_from_env_http_without_auth_from_wrong_netrc(
-        proxy_test_server, get_request, tmpdir, mocker):
+        proxy_test_server, get_request, tmp_path, mocker):
     url = 'http://aiohttp.io/path'
     proxy = await proxy_test_server()
     auth = aiohttp.BasicAuth('user', 'pass')
-    netrc_file = tmpdir.join('test_netrc')
+    netrc_file = tmp_path / 'test_netrc'
     invalid_data = 'machine 127.0.0.1 %s pass %s' % (
         auth.login, auth.password)
     with open(str(netrc_file), 'w') as f:

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, tmpdir) -> None:
+def test_run_app_http_unix_socket(patched_loop, tmp_path) -> None:
     app = web.Application()
 
-    sock_path = str(tmpdir / 'socket.sock')
+    sock_path = str(tmp_path / '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, tmpdir) -> None:
 
 
 @skip_if_no_unix_socks
-def test_run_app_https_unix_socket(patched_loop, tmpdir) -> None:
+def test_run_app_https_unix_socket(patched_loop, tmp_path) -> None:
     app = web.Application()
 
-    sock_path = str(tmpdir / 'socket.sock')
+    sock_path = str(tmp_path / '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_functional.py

@@ -1560,7 +1560,7 @@ async def handler(request):
                     {'name': 'file', 'filename': 'file', 'filename*': 'file'})
 
 
-async def test_response_with_bodypart_named(aiohttp_client, tmpdir) -> None:
+async def test_response_with_bodypart_named(aiohttp_client, tmp_path) -> None:
 
     async def handler(request):
         reader = await request.multipart()
@@ -1571,7 +1571,7 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    f = tmpdir.join('foobar.txt')
+    f = tmp_path / 'foobar.txt'
     f.write_text('test', encoding='utf8')
     data = {'file': open(str(f), 'rb')}
     resp = await client.post('/', data=data)

tests/test_web_sendfile_functional.py

@@ -319,18 +319,18 @@ def test_static_route_path_existence_check() -> None:
         web.StaticResource("/", nodirectory)
 
 
-async def test_static_file_huge(aiohttp_client, tmpdir) -> None:
+async def test_static_file_huge(aiohttp_client, tmp_path) -> None:
     filename = 'huge_data.unknown_mime_type'
 
     # fill 20MB file
-    with tmpdir.join(filename).open('w') as f:
+    with (tmp_path / filename).open('w') as f:
         for i in range(1024*20):
             f.write(chr(i % 64 + 0x20) * 1024)
 
-    file_st = os.stat(str(tmpdir.join(filename)))
+    file_st = os.stat(str((tmp_path / filename)))
 
     app = web.Application()
-    app.router.add_static('/static', str(tmpdir))
+    app.router.add_static('/static', str(tmp_path))
     client = await aiohttp_client(app)
 
     resp = await client.get('/static/'+filename)
@@ -340,7 +340,7 @@ async def test_static_file_huge(aiohttp_client, tmpdir) -> None:
     assert resp.headers.get('CONTENT-ENCODING') is None
     assert int(resp.headers.get('CONTENT-LENGTH')) == file_st.st_size
 
-    f = tmpdir.join(filename).open('rb')
+    f = (tmp_path / filename).open('rb')
     off = 0
     cnt = 0
     while off < file_st.st_size:
@@ -751,11 +751,11 @@ async def handler(request):
     await resp.release()
 
 
-async def test_static_file_huge_cancel(aiohttp_client, tmpdir) -> None:
+async def test_static_file_huge_cancel(aiohttp_client, tmp_path) -> None:
     filename = 'huge_data.unknown_mime_type'
 
     # fill 100MB file
-    with tmpdir.join(filename).open('w') as f:
+    with (tmp_path / filename).open('w') as f:
         for i in range(1024*20):
             f.write(chr(i % 64 + 0x20) * 1024)
 
@@ -768,7 +768,7 @@ async def handler(request):
         tr = request.transport
         sock = tr.get_extra_info('socket')
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 1024)
-        ret = web.FileResponse(pathlib.Path(str(tmpdir.join(filename))))
+        ret = web.FileResponse(pathlib.Path(str((tmp_path / filename))))
         return ret
 
     app = web.Application()
@@ -789,11 +789,11 @@ async def handler(request):
     assert len(data) < 1024 * 1024 * 20
 
 
-async def test_static_file_huge_error(aiohttp_client, tmpdir) -> None:
+async def test_static_file_huge_error(aiohttp_client, tmp_path) -> None:
     filename = 'huge_data.unknown_mime_type'
 
     # fill 20MB file
-    with tmpdir.join(filename).open('wb') as f:
+    with (tmp_path / filename).open('wb') as f:
         f.seek(20*1024*1024)
         f.write(b'1')
 
@@ -802,7 +802,7 @@ async def handler(request):
         tr = request.transport
         sock = tr.get_extra_info('socket')
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 1024)
-        ret = web.FileResponse(pathlib.Path(str(tmpdir.join(filename))))
+        ret = web.FileResponse(pathlib.Path(str((tmp_path / filename))))
         return ret
 
     app = web.Application()

tests/test_web_urldispatcher.py

@@ -438,12 +438,12 @@ async def post(self):
     await r.release()
 
 
-async def test_static_absolute_url(aiohttp_client, tmpdir) -> None:
+async def test_static_absolute_url(aiohttp_client, tmp_path) -> None:
     # requested url is an absolute name like
     # /static/\\machine_name\c$ or /static/D:\path
     # where the static dir is totally different
     app = web.Application()
-    fname = tmpdir / 'file.txt'
+    fname = tmp_path / 'file.txt'
     fname.write_text('sample text', 'ascii')
     here = pathlib.Path(__file__).parent
     app.router.add_static('/static', here)