Add teardown to AbstractCommunicator and apply it

beekeepy/beekeepy/_handle/beekeeper.py

@@ -140,7 +140,7 @@ class BeekeeperCommon(BeekeeperNotificationCallbacks, ABC):
         try:
             self.__wait_till_ready()
         except (AssertionError, TimeoutError) as e:
-            self.close()
+            self._close()
             raise BeekeeperFailedToStartNotReadyOnTimeError from e
 
     def _run_application(self, settings: Settings, additional_cli_arguments: BeekeeperArguments) -> None:
@@ -163,7 +163,7 @@ class BeekeeperCommon(BeekeeperNotificationCallbacks, ABC):
         self.__close_notification_server()
         return pid
 
-    def close(self) -> None:
+    def _close(self) -> None:
         self._close_application()
         self.__close_notification_server()
 
@@ -218,7 +218,11 @@ class Beekeeper(BeekeeperCommon, SyncRemoteBeekeeper, ContextSync["Beekeeper"]):
         return self
 
     def _finally(self) -> None:
-        self.close()
+        self.teardown()
+
+    def teardown(self) -> None:
+        self._close()
+        super().teardown()
 
 
 class AsyncBeekeeper(BeekeeperCommon, AsyncRemoteBeekeeper, ContextAsync["AsyncBeekeeper"]):
@@ -244,4 +248,8 @@ class AsyncBeekeeper(BeekeeperCommon, AsyncRemoteBeekeeper, ContextAsync["AsyncB
         return self
 
     async def _afinally(self) -> None:
-        self.close()
+        self.teardown()
+
+    def teardown(self) -> None:
+        self._close()
+        super().teardown()

beekeepy/beekeepy/_interface/asynchronous/beekeeper.py

@@ -51,7 +51,7 @@ class Beekeeper(BeekeeperInterface, StateInvalidator):
     @StateInvalidator.empty_call_after_invalidation(None)
     def teardown(self) -> None:
         if isinstance(self.__instance, AsynchronousBeekeeperHandle):
-            self.__instance.close()
+            self.__instance.teardown()
         self.invalidate(InvalidatedStateByClosingBeekeeperError())
 
     def detach(self) -> int:

beekeepy/beekeepy/_interface/synchronous/beekeeper.py

@@ -51,7 +51,7 @@ class Beekeeper(BeekeeperInterface, StateInvalidator):
     @StateInvalidator.empty_call_after_invalidation(None)
     def teardown(self) -> None:
         if isinstance(self.__instance, SynchronousBeekeeperHandle):
-            self.__instance.close()
+            self.__instance.teardown()
         self.invalidate(InvalidatedStateByClosingBeekeeperError())
 
     def detach(self) -> int:

helpy/helpy/_communication/abc/communicator.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 import asyncio
 import time
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING
+from threading import Thread
+from typing import TYPE_CHECKING, Any, Awaitable
 
 from helpy._communication.settings import CommunicationSettings
 from helpy._interfaces.settings_holder import SharedSettingsHolder
@@ -26,6 +27,10 @@ class AbstractCommunicator(SharedSettingsHolder[CommunicationSettings], ABC):
     async def _async_send(self, url: HttpUrl, data: bytes, stopwatch: StopwatchResult) -> str:
         """Sends to given url given data asynchronously."""
 
+    @abstractmethod
+    def teardown(self) -> None:
+        """Called when work with communicator is over."""
+
     async def _async_sleep_for_retry(self) -> None:
         """Sleeps using asyncio.sleep (for asynchronous implementations)."""
         await asyncio.sleep(self.settings.period_between_retries.total_seconds())
@@ -70,3 +75,8 @@ class AbstractCommunicator(SharedSettingsHolder[CommunicationSettings], ABC):
         return TimeoutExceededError(
             url=url, request=data, timeout_secs=self.settings.timeout.total_seconds(), total_wait_time=total_time_secs
         )
+
+    def _asyncio_run(self, coro: Awaitable[Any]) -> None:
+        thread = Thread(target=asyncio.run, args=(coro,))
+        thread.start()
+        thread.join()

helpy/helpy/_communication/aiohttp_communicator.py

@@ -54,3 +54,6 @@ class AioHttpCommunicator(AbstractCommunicator):
 
     def _send(self, url: HttpUrl, data: bytes, stopwatch: StopwatchResult) -> str:
         raise NotImplementedError
+
+    def teardown(self) -> None:
+        self._asyncio_run(self.session.close())

helpy/helpy/_communication/httpx_communicator.py

@@ -25,9 +25,9 @@ class HttpxCommunicator(AbstractCommunicator):
         self.__async_client: httpx.AsyncClient | None = None
         self.__sync_client: httpx.Client | None = None
 
-    async def close(self) -> None:
+    def teardown(self) -> None:
         if self.__async_client is not None:
-            await self.__async_client.aclose()
+            self._asyncio_run(self.__async_client.aclose())
             self.__async_client = None
 
         if self.__sync_client is not None:

helpy/helpy/_communication/request_communicator.py

@@ -57,3 +57,6 @@ class RequestCommunicator(AbstractCommunicator):
         if last_exception is None:
             raise ValueError("Retry loop finished, but last_exception was not set")
         raise last_exception
+
+    def teardown(self) -> None:
+        self.session.close()

helpy/helpy/_handles/abc/handle.py

@@ -113,6 +113,9 @@ class AbstractHandle(UniqueSettingsHolder[Settings], ABC, Generic[ApiT]):
     def __configure_logger(self) -> Logger:
         return logger.bind(**self._logger_extras())
 
+    def teardown(self) -> None:
+        self._overseer.teardown()
+
 
 class AbstractAsyncHandle(AbstractHandle[ApiT], ABC):
     """Base class for service handlers that uses asynchronous communication."""

tests/beekeepy_test/handle/basic/test_wallet.py

@@ -43,7 +43,7 @@ def test_invalid_wallet_names(beekeeper: Beekeeper, invalid_wallet_name: str) ->
 
 def test_wallet_open(beekeeper: Beekeeper, wallet: WalletInfo) -> None:
     # ARRANGE
-    beekeeper.close()
+    beekeeper.teardown()
     beekeeper.run()
 
     # ACT & ASSERT

tests/beekeepy_test/handle/conftest.py

@@ -29,7 +29,7 @@ def beekeeper_not_started(settings_with_logger: SettingsLoggerFactory) -> Iterat
     yield bk
 
     if bk.is_running:
-        bk.close()
+        bk.teardown()
 
 
 @pytest.fixture()

tests/beekeepy_test/handle/various/test_blocking_unlock.py

@@ -30,7 +30,7 @@ def beekeeper_not_started(settings_with_logger: SettingsLoggerFactory) -> Iterat
     yield bk
 
     if bk.is_running:
-        bk.close()
+        bk.teardown()
 
 
 @pytest.fixture()

tests/conftest.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import re
 import shutil
 from pathlib import Path
+from typing import AsyncIterator, Iterator
 
 import pytest
 
@@ -59,10 +60,12 @@ def hived_http_endpoint(request: pytest.FixtureRequest) -> helpy.HttpUrl:
 
 
 @pytest.fixture()
-def sync_node(hived_http_endpoint: helpy.HttpUrl) -> helpy.Hived:
-    return helpy.Hived(settings=helpy.Settings(http_endpoint=hived_http_endpoint))
+def sync_node(hived_http_endpoint: helpy.HttpUrl) -> Iterator[helpy.Hived]:
+    with helpy.Hived(settings=helpy.Settings(http_endpoint=hived_http_endpoint)) as hived:
+        yield hived
 
 
 @pytest.fixture()
-def async_node(hived_http_endpoint: helpy.HttpUrl) -> helpy.AsyncHived:
-    return helpy.AsyncHived(settings=helpy.Settings(http_endpoint=hived_http_endpoint))
+async def async_node(hived_http_endpoint: helpy.HttpUrl) -> AsyncIterator[helpy.AsyncHived]:
+    async with helpy.AsyncHived(settings=helpy.Settings(http_endpoint=hived_http_endpoint)) as hived:
+        yield hived