From 7f52a54e19ce51e1a934bdaee57215c0da043ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CMariusz=20Trela=E2=80=9D?= <mtrela@syncad.com>
Date: Mon, 17 Mar 2025 12:58:25 +0100
Subject: [PATCH 1/3] Increase timeout to 30 seconds
---
beekeepy/beekeepy/_runnable_handle/settings.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/beekeepy/beekeepy/_runnable_handle/settings.py b/beekeepy/beekeepy/_runnable_handle/settings.py
index c989f3e4..1fbc6b47 100644
--- a/beekeepy/beekeepy/_runnable_handle/settings.py
+++ b/beekeepy/beekeepy/_runnable_handle/settings.py
@@ -23,7 +23,7 @@ class Settings(RemoteHandleSettings):
WORKING_DIRECTORY: ClassVar[Path] = Path.cwd()
PROPAGATE_SIGINT: ClassVar[bool] = True
CLOSE_TIMEOUT: ClassVar[timedelta] = timedelta(seconds=10.0)
- INITIALIZATION_TIMEOUT: ClassVar[timedelta] = timedelta(seconds=5.0)
+ INITIALIZATION_TIMEOUT: ClassVar[timedelta] = timedelta(seconds=30.0)
working_directory: Path | None = None
"""Path, where beekeeper binary will store all it's data and logs."""
--
GitLab
From e10a1741923915b153c0a2ca214ce81c0b767516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CMariusz=20Trela=E2=80=9D?= <mtrela@syncad.com>
Date: Mon, 17 Mar 2025 12:58:43 +0100
Subject: [PATCH 2/3] Bump `hived`
---
.gitlab-ci.yml | 2 +-
hive | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5daaec37..afcab382 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ variables:
include:
- project: 'hive/hive'
# This has to be the same as the commit checked out in the submodule
- ref: ed702f86d3a1ae567b2d2e1d0d7240a187223964
+ ref: 68a21384a69f34f1f5fbd8afc6469a8ab8586c0d
file: '/scripts/ci-helpers/prepare_data_image_job.yml'
- project: 'hive/common-ci-configuration'
# This should be the same version of Common CI defined in /hive/scripts/ci-helpers/prepare_data_image_job.yml
diff --git a/hive b/hive
index ed702f86..68a21384 160000
--- a/hive
+++ b/hive
@@ -1 +1 @@
-Subproject commit ed702f86d3a1ae567b2d2e1d0d7240a187223964
+Subproject commit 68a21384a69f34f1f5fbd8afc6469a8ab8586c0d
--
GitLab
From 06975fc98f409a4420f78ea232b79ec4e13e96e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CMariusz=20Trela=E2=80=9D?= <mtrela@syncad.com>
Date: Mon, 17 Mar 2025 14:28:51 +0100
Subject: [PATCH 3/3] Fixes in tests. Closing of a wallet doesn't throw an
error when a wallet doesn't exist
---
tests/beekeepy_test/handle/api_tests/test_api_close.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/tests/beekeepy_test/handle/api_tests/test_api_close.py b/tests/beekeepy_test/handle/api_tests/test_api_close.py
index 53999acf..2a638545 100644
--- a/tests/beekeepy_test/handle/api_tests/test_api_close.py
+++ b/tests/beekeepy_test/handle/api_tests/test_api_close.py
@@ -51,8 +51,7 @@ def test_api_close_double_close(
beekeeper.api.close(wallet_name=wallet.name)
# ASSERT
- with pytest.raises(ErrorInResponseError, match=f"Wallet not found: {wallet.name}"):
- beekeeper.api.close(wallet_name=wallet.name)
+ beekeeper.api.close(wallet_name=wallet.name)
def test_api_close_not_existing_wallet(beekeeper: Beekeeper) -> None:
@@ -61,5 +60,4 @@ def test_api_close_not_existing_wallet(beekeeper: Beekeeper) -> None:
wallet = WalletInfo(password=generate_wallet_password(), name=generate_wallet_name())
# ACT & ASSERT
- with pytest.raises(ErrorInResponseError, match=f"Wallet not found: {wallet.name}"):
- beekeeper.api.close(wallet_name=wallet.name)
+ beekeeper.api.close(wallet_name=wallet.name)
--
GitLab