From 7f10a39655513f72c34ac2a6a9af8cc5bb9c599f Mon Sep 17 00:00:00 2001
From: ZeliardM <140266236+ZeliardM@users.noreply.github.com>
Date: Sun, 5 Jul 2026 12:27:25 -0400
Subject: [PATCH] tests: centralize transport and session cleanup in conftest
 (#1683)

---
 tests/conftest.py                      | 42 ++++++++++++++++++++++++++
 tests/transports/test_klaptransport.py |  1 -
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 6162d3af..0d97f16a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,12 +1,14 @@
 from __future__ import annotations
 
 import asyncio
+import functools
 import os
 import sys
 import warnings
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
+import aiohttp
 import pytest
 
 # TODO: this and runner fixture could be moved to tests/cli/conftest.py
@@ -16,6 +18,7 @@ from kasa import (
     DeviceConfig,
     SmartProtocol,
 )
+from kasa.httpclient import HttpClient
 from kasa.transports.basetransport import BaseTransport
 
 from .device_fixtures import *  # noqa: F403
@@ -26,6 +29,45 @@ from .fixtureinfo import fixture_info  # noqa: F401
 turn_on = pytest.mark.parametrize("turn_on", [True, False])
 
 
+@pytest.fixture(autouse=True)
+async def _close_transport_and_http_sessions(monkeypatch):
+    """Ensure all transports and http clients close their sessions after tests."""
+    transports: list[BaseTransport] = []
+    http_clients: list[HttpClient] = []
+    aiohttp_sessions: list[aiohttp.ClientSession] = []
+
+    original_transport_init = BaseTransport.__init__
+    original_http_init = HttpClient.__init__
+    original_session_init = aiohttp.ClientSession.__init__
+
+    @functools.wraps(original_transport_init)
+    def _track_transport(self, *args, **kwargs):
+        original_transport_init(self, *args, **kwargs)
+        transports.append(self)
+
+    @functools.wraps(original_http_init)
+    def _track_http(self, *args, **kwargs):
+        original_http_init(self, *args, **kwargs)
+        http_clients.append(self)
+
+    @functools.wraps(original_session_init)
+    def _track_session(self, *args, **kwargs):
+        original_session_init(self, *args, **kwargs)
+        aiohttp_sessions.append(self)
+
+    monkeypatch.setattr(BaseTransport, "__init__", _track_transport)
+    monkeypatch.setattr(HttpClient, "__init__", _track_http)
+    monkeypatch.setattr(aiohttp.ClientSession, "__init__", _track_session)
+    yield
+    for transport in transports:
+        await transport.close()
+    for client in http_clients:
+        await client.close()
+    for session in aiohttp_sessions:
+        if not session.closed:
+            await session.close()
+
+
 def load_fixture(foldername, filename):
     """Load a fixture."""
     path = Path(Path(__file__).parent / "fixtures" / foldername / filename)
diff --git a/tests/transports/test_klaptransport.py b/tests/transports/test_klaptransport.py
index 26d9f57a..7fd56cf5 100644
--- a/tests/transports/test_klaptransport.py
+++ b/tests/transports/test_klaptransport.py
@@ -411,7 +411,6 @@ async def test_handshake(
 
     config = DeviceConfig("127.0.0.1", credentials=client_credentials)
     protocol = IotProtocol(transport=transport_class(config=config))
-    protocol._transport.http_client = aiohttp.ClientSession()
 
     response_status = 200
     await protocol._transport.perform_handshake()