From 3af2137c1c339ad98bd0c3407b08adeeafb0481c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Mas=C5=82owski?= Date: Fri, 21 Nov 2025 12:18:04 +0000 Subject: [PATCH 1/4] Remove votes_updated_at field from WitnessesVotersResponseSchema --- tests/local-tools/local_tools/beekeepy/simple_api.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/local-tools/local_tools/beekeepy/simple_api.py b/tests/local-tools/local_tools/beekeepy/simple_api.py index 64e22679..fef50f55 100644 --- a/tests/local-tools/local_tools/beekeepy/simple_api.py +++ b/tests/local-tools/local_tools/beekeepy/simple_api.py @@ -28,7 +28,6 @@ class VoterSchema(PreconfiguredBaseModel): class WitnessesVotersResponseSchema(PreconfiguredBaseModel): total_votes: int total_pages: int - votes_updated_at: str voters: list[VoterSchema] -- GitLab From 8d14ac8fe54ae17635ea175a0a33b9f67ce3cde2 Mon Sep 17 00:00:00 2001 From: kmochocki Date: Wed, 26 Nov 2025 13:35:03 +0000 Subject: [PATCH 2/4] Catch other and rethrow FailedToStartExecutableError during startup --- beekeepy/beekeepy/_executable/abc/executable.py | 5 +++-- beekeepy/beekeepy/_runnable_handle/runnable_handle.py | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/beekeepy/beekeepy/_executable/abc/executable.py b/beekeepy/beekeepy/_executable/abc/executable.py index ad0f528b..b3ddaf79 100644 --- a/beekeepy/beekeepy/_executable/abc/executable.py +++ b/beekeepy/beekeepy/_executable/abc/executable.py @@ -14,7 +14,7 @@ from beekeepy._executable.abc.arguments import Arguments from beekeepy._executable.abc.config import Config from beekeepy._executable.abc.streams import StreamsHolder from beekeepy._utilities.context import ContextSync -from beekeepy.exceptions import ExecutableIsNotRunningError, TimeoutReachWhileCloseError +from beekeepy.exceptions import ExecutableIsNotRunningError, FailedToStartExecutableError, TimeoutReachWhileCloseError if TYPE_CHECKING: from collections.abc import Iterator @@ -245,7 +245,8 @@ class Executable(Closeable, Generic[ConfigT, ArgumentT]): return self.run_and_get_output(arguments=self.__arguments.just_get_version()) def reserved_ports(self, *, timeout_seconds: int = 10) -> list[int]: - assert self.is_running(), "Cannot obtain reserved ports for not started executable" + if not self.is_running(): + raise FailedToStartExecutableError("Executable is not running, cannot get reserved ports") start = time.perf_counter() while start + timeout_seconds >= time.perf_counter(): connections = psutil.net_connections("inet4") diff --git a/beekeepy/beekeepy/_runnable_handle/runnable_handle.py b/beekeepy/beekeepy/_runnable_handle/runnable_handle.py index 3b1ee049..752e999e 100644 --- a/beekeepy/beekeepy/_runnable_handle/runnable_handle.py +++ b/beekeepy/beekeepy/_runnable_handle/runnable_handle.py @@ -17,6 +17,7 @@ from beekeepy._runnable_handle.match_ports import PortMatchingResult, match_port from beekeepy._runnable_handle.settings import RunnableHandleSettings from beekeepy.exceptions import ( ApiNotFoundError, + CommunicationError, FailedToDetectReservedPortsError, FailedToStartExecutableError, ) @@ -269,6 +270,8 @@ class RunnableHandle(ABC, Generic[ExecutableT, ConfigT, ArgumentT, SettingsT]): "HTTP port detected, but cannot obtain further information. app_status_api plugin is not enabled!" ) return matched_ports + except CommunicationError as e: + raise FailedToStartExecutableError("Cannot communicate with application on detected HTTP port") from e assert status is not None, "Error has not been caught and further port discovery started" http = status.webservers.HTTP -- GitLab From 4bba563199f54e1adb1aea3ee74ce138f1b9d295 Mon Sep 17 00:00:00 2001 From: kmochocki Date: Fri, 28 Nov 2025 03:28:06 +0000 Subject: [PATCH 3/4] Bump hive submodule --- .gitlab-ci.yml | 2 +- hive | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9305b56..f7d330bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: include: - project: 'hive/hive' # This has to be the same as the commit checked out in the submodule - ref: f3a19664e0490647b318c9cc264c75a17c5be9f8 + ref: 40e7d1e8bb7d6f7df5cfb070d808cb387a9adc9f file: '/scripts/ci-helpers/prepare_data_image_job.yml' # DO NOT include ccc here. It will be indirectly included by above yaml file. #- project: 'hive/common-ci-configuration' diff --git a/hive b/hive index d765b556..40e7d1e8 160000 --- a/hive +++ b/hive @@ -1 +1 @@ -Subproject commit d765b5569c3cdef8e2040bcc3ffb79debcba28c5 +Subproject commit 40e7d1e8bb7d6f7df5cfb070d808cb387a9adc9f -- GitLab From 0d27428d281120117662e2ad450bdd87872ff8ae Mon Sep 17 00:00:00 2001 From: kmochocki Date: Fri, 28 Nov 2025 03:33:33 +0000 Subject: [PATCH 4/4] Fix help pattern --- .../patterns/help_pattern.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/beekeepy_test/handle/commandline/application_command_line_options/patterns/help_pattern.txt b/tests/beekeepy_test/handle/commandline/application_command_line_options/patterns/help_pattern.txt index b08615a8..88c6cd83 100644 --- a/tests/beekeepy_test/handle/commandline/application_command_line_options/patterns/help_pattern.txt +++ b/tests/beekeepy_test/handle/commandline/application_command_line_options/patterns/help_pattern.txt @@ -12,8 +12,8 @@ Application Options: --webserver-ws-deflate arg (=0) Enable the RFC-7692 permessage-deflate extension for the WebSocket server (only used if the client requests it). This may save bandwidth at the expense of CPU - --webserver-thread-pool-size arg (=32) - Number of threads used to handle queries. Default: 32. + --webserver-thread-pool-size arg (=16) + Number of threads used to handle queries. Default: 16. --webserver-https-certificate-file-name arg File name with a server's certificate. --webserver-https-key-file-name arg -- GitLab