Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions fsspec/implementations/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,10 @@ def close_session(loop, session):
return
except (TimeoutError, FSTimeoutError):
pass
if session._connector is not None:
connector = getattr(session, "_connector", None)
if connector is not None:
# close after loop is dead
session._connector._close()
connector._close()

async def set_session(self):
if self._session is None:
Expand Down
20 changes: 20 additions & 0 deletions fsspec/implementations/tests/test_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,19 @@ def test_put_file(server, tmp_path, method, reset_files):
assert fs.cat(server + "/hey_3") == b"yyy"


async def get_aiohttp():
from aiohttp import ClientSession

return ClientSession()


async def get_proxy():
class ProxyClient:
pass

return ProxyClient()


@pytest.mark.xfail(
condition=sys.flags.optimize > 1, reason="no docstrings when optimised"
)
Expand Down Expand Up @@ -548,3 +561,10 @@ def test_processes(server, method):
out = q.get()
assert out == fs.cat(fn)
p.join()


@pytest.mark.parametrize("get_client", [get_aiohttp, get_proxy])
@pytest.mark.skipif(sys.version_info < (3, 7), reason="no asyncio.run in <3.7")
def test_close(get_client):
fs = fsspec.filesystem("http", skip_instance_cache=True)
fs.close_session(None, asyncio.run(get_client()))