Fix tests that used open_wallet to close already unlocked wallet by accident

tests/beekeepy_test/handle/api_tests/test_api_get_public_keys.py

@@ -18,12 +18,12 @@ def open_and_unlock_wallet(beekeeper: Beekeeper, wallet: WalletInfo) -> None:
 
 
 @pytest.mark.parametrize("explicit_wallet_name", [False, True])
-def test_api_get_public_keys(
+def test_api_get_public_keys_xxx(
     beekeeper: Beekeeper, setup_wallets: WalletsGeneratorT, explicit_wallet_name: bool
 ) -> None:
     """Test test_api_get_public_keys will test beekeeper_api.get_public_keys api call."""
     # ARRANGE
-    wallets = setup_wallets(1, import_keys=False, keys_per_wallet=5)
+    wallets = setup_wallets(1, import_keys=False, keys_per_wallet=5, lock=False)
     wallet = wallets[0]
 
     explicit_wallet_name_param = {"wallet_name": wallet.name} if explicit_wallet_name else {}

tests/beekeepy_test/handle/api_tests/test_api_import_key.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 def test_api_import_key(beekeeper: Beekeeper, setup_wallets: WalletsGeneratorT) -> None:
     """Test test_api_import_key will test beekeeper_api.import_key api call."""
     # ARRANGE
-    wallets = setup_wallets(1, import_keys=False, keys_per_wallet=5)
+    wallets = setup_wallets(1, import_keys=False, keys_per_wallet=5, lock=False)
     wallet = wallets[0]
 
     # ACT & ASSERT

tests/beekeepy_test/handle/api_tests/test_api_open.py

@@ -2,20 +2,18 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from local_tools.beekeepy.generators import generate_wallet_name, generate_wallet_password
-from local_tools.beekeepy.models import WalletInfo
-
 if TYPE_CHECKING:
+    from local_tools.beekeepy.models import WalletsGeneratorT
+
     from beekeepy._handle import Beekeeper
 
 
-def test_api_open(beekeeper: Beekeeper) -> None:
+def test_api_open(beekeeper: Beekeeper, setup_wallets: WalletsGeneratorT) -> None:
     """Test test_api_open will test beekeeper_api.open api call."""
     # ARRANGE
-    wallet = WalletInfo(password=generate_wallet_password(), name=generate_wallet_name())
-    wallet_path = beekeeper.settings.ensured_working_directory / f"{wallet.name}.wallet"
+    wallet_path = beekeeper.settings.ensured_working_directory / "wallet-0.wallet"
     assert wallet_path.exists() is False, "Before creation there should be no wallet file."
-    beekeeper.api.create(wallet_name=wallet.name, password=wallet.password)
+    wallet = setup_wallets(1, keys_per_wallet=0)[0]
 
     # ACT
     beekeeper.api.open(wallet_name=wallet.name)
@@ -27,11 +25,10 @@ def test_api_open(beekeeper: Beekeeper) -> None:
     ), "After creation wallet should be visible in beekeeper."
 
 
-def test_api_reopen_already_opened(beekeeper: Beekeeper) -> None:
+def test_api_reopen_already_opened(beekeeper: Beekeeper, setup_wallets: WalletsGeneratorT) -> None:
     """Test test_api_reopen_already_opened will try to open already opened wallet."""
     # ARRANGE
-    wallet = WalletInfo(password=generate_wallet_password(), name=generate_wallet_name())
-    beekeeper.api.create(wallet_name=wallet.name, password=wallet.password)
+    wallet = setup_wallets(1, keys_per_wallet=0)[0]
 
     # ACT
     beekeeper.api.open(wallet_name=wallet.name)
@@ -42,11 +39,10 @@ def test_api_reopen_already_opened(beekeeper: Beekeeper) -> None:
     assert len((beekeeper.api.list_wallets()).wallets) == 1, "There should be 1 wallet opened."
 
 
-def test_api_reopen_closed(beekeeper: Beekeeper) -> None:
+def test_api_reopen_closed(beekeeper: Beekeeper, setup_wallets: WalletsGeneratorT) -> None:
     """Test test_api_reopen_closed will try to open closed wallet."""
     # ARRANGE
-    wallet = WalletInfo(password=generate_wallet_password(), name=generate_wallet_name())
-    beekeeper.api.create(wallet_name=wallet.name, password=wallet.password)
+    wallet = setup_wallets(1, keys_per_wallet=0)[0]
 
     # ACT
     beekeeper.api.open(wallet_name=wallet.name)

tests/beekeepy_test/handle/api_tests/test_api_remove_key.py

@@ -62,7 +62,7 @@ def test_api_remove_key_from_closed(beekeeper: Beekeeper, wallet: WalletInfo, ac
 def test_api_remove_key_simple_scenario(beekeeper: Beekeeper, setup_wallets: WalletsGeneratorT) -> None:
     """Test test_api_remove_key_simple_scenario will test simple flow of importing and removing keys."""
     # ARRANGE
-    wallets = setup_wallets(1, import_keys=True, keys_per_wallet=5)
+    wallets = setup_wallets(1, import_keys=True, keys_per_wallet=5, lock=False)
     wallet = wallets[0]
     key_to_remove = wallet.accounts.pop(3)
 

tests/beekeepy_test/handle/api_tests/test_api_set_timeout.py

@@ -9,11 +9,9 @@ if TYPE_CHECKING:
     from beekeepy._handle import Beekeeper
 
 
-def test_api_set_timeout(beekeeper: Beekeeper, wallet: WalletInfo) -> None:
+def test_api_set_timeout(beekeeper: Beekeeper, wallet: WalletInfo) -> None:  # noqa: ARG001
     """Test test_api_set_timeout will test beekeeper_api.set_timeout api call."""
     # ARRANGE
-    beekeeper.api.open(wallet_name=wallet.name)
-    beekeeper.api.unlock(wallet_name=wallet.name, password=wallet.password)
     bk_wallet = (beekeeper.api.list_wallets()).wallets[0]
     assert bk_wallet.unlocked is True, "Wallet should be unlocked."
 

tests/beekeepy_test/handle/api_tests/test_api_unlock.py

@@ -16,9 +16,10 @@ if TYPE_CHECKING:
 def test_api_unlock(beekeeper: Beekeeper, wallet: WalletInfo) -> None:
     """Test test_api_unlock will test beekeeper_api.unlock."""
     # ARRANGE
-    beekeeper.api.open(wallet_name=wallet.name)
+    beekeeper.api.lock_all()
 
     # ACT
+    beekeeper.api.open(wallet_name=wallet.name)
     beekeeper.api.unlock(wallet_name=wallet.name, password=wallet.password)
 
     # ASSERT
@@ -26,12 +27,9 @@ def test_api_unlock(beekeeper: Beekeeper, wallet: WalletInfo) -> None:
     assert bk_wallet.unlocked is True, "Wallet should be unlocked."
 
 
-def test_api_unlock_already_unclocked_wallet(beekeeper: Beekeeper, wallet: WalletInfo) -> None:
-    """Test test_api_unlock_already_unclocked_wallet will try to unlock already unlocked wallet."""
+def test_api_unlock_already_unlocked_wallet(beekeeper: Beekeeper, wallet: WalletInfo) -> None:
+    """Test test_api_unlock_already_unlocked_wallet will try to unlock already unlocked wallet."""
     # ARRANGE
-    beekeeper.api.open(wallet_name=wallet.name)
-    beekeeper.api.unlock(wallet_name=wallet.name, password=wallet.password)
-
     bk_wallet = (beekeeper.api.list_wallets()).wallets[0]
     assert bk_wallet.unlocked is True, "Wallet should be unlocked."
 

tests/beekeepy_test/handle/basic/test_wallet.py

@@ -76,7 +76,7 @@ def test_timeout(beekeeper: Beekeeper, wallet: WalletInfo) -> None:
     check_wallets(beekeeper.api.list_wallets(), [wallet.name])
 
     # ACT
-    time.sleep(timeout)
+    time.sleep(timeout + 1)
 
     # ASSERT
     check_wallets(beekeeper.api.list_wallets(), [wallet.name], unlocked=False)

tests/beekeepy_test/handle/commandline/application_options/test_export_keys_wallet.py

@@ -53,8 +53,6 @@ def test_export_keys(beekeeper: Beekeeper) -> None:
     extract_path = beekeeper.settings.ensured_working_directory
 
     create = beekeeper.api.create(wallet_name=wallet_name)
-    beekeeper.api.open(wallet_name=wallet_name)
-    beekeeper.api.unlock(password=create.password, wallet_name=wallet_name)
 
     for key_pair in PRIVATE_AND_PUBLIC_KEYS:
         beekeeper.api.import_key(wif_key=key_pair.private_key, wallet_name=wallet_name)

tests/beekeepy_test/handle/commandline/application_options/test_unlock_timeout.py

@@ -27,7 +27,7 @@ def test_unlock_time(beekeeper_not_started: Beekeeper, unlock_timeout: int) -> N
     check_wallet_lock(beekeeper_not_started, required_status=True)
 
     # ACT
-    time.sleep(unlock_timeout)
+    time.sleep(unlock_timeout + 1)
 
     # ASSERT
     check_wallet_lock(beekeeper_not_started, required_status=False)

tests/beekeepy_test/handle/conftest.py

@@ -61,7 +61,7 @@ def keys_to_import() -> list[AccountCredentials]:
 def setup_wallets(beekeeper: Beekeeper) -> WalletsGeneratorT:
     @wraps(setup_wallets)
     def __setup_wallets(
-        count: int, *, import_keys: bool = True, keys_per_wallet: int = 1
+        count: int, *, import_keys: bool = True, keys_per_wallet: int = 1, lock: bool = True
     ) -> list[WalletInfoWithImportedAccounts]:
         wallets = [
             WalletInfoWithImportedAccounts(
@@ -83,6 +83,8 @@ def setup_wallets(beekeeper: Beekeeper) -> WalletsGeneratorT:
                 if import_keys:
                     for account in wallet.accounts:
                         bk.api.beekeeper.import_key(wallet_name=wallet.name, wif_key=account.private_key)
+                if lock:
+                    bk.api.beekeeper.close(wallet_name=wallet.name)
         return wallets
 
     return __setup_wallets

tests/beekeepy_test/handle/simple_flow/test_simple_flow.py

@@ -163,6 +163,7 @@ def create_wallets_if_needed(
     bk.api.create(wallet_name=wallet.name, password=wallet.password)
     for keys in wallet.keys:
         bk.api.import_key(wallet_name=wallet.name, wif_key=keys.private_key)
+    bk.api.lock(wallet_name=wallet.name)
 
 
 @pytest.mark.parametrize(

tests/local-tools/local_tools/beekeepy/models.py

@@ -28,7 +28,7 @@ class WalletInfoWithImportedAccounts(WalletInfo):
 
 class WalletsGeneratorT(Protocol):
     def __call__(
-        self, count: int, *, import_keys: bool = True, keys_per_wallet: int = 1
+        self, count: int, *, import_keys: bool = True, keys_per_wallet: int = 1, lock: bool = True
     ) -> list[WalletInfoWithImportedAccounts]: ...