diff --git a/neofs-keywords b/neofs-keywords index 1d7ebe1..5865009 160000 --- a/neofs-keywords +++ b/neofs-keywords @@ -1 +1 @@ -Subproject commit 1d7ebe1d6d4bb6c8ce62f36091347bddb54d333b +Subproject commit 58650099362f05b51b97f04e2244a4ba20f88351 diff --git a/pytest_tests/testsuites/container/test_container.py b/pytest_tests/testsuites/container/test_container.py index 79c64c5..9224ffa 100644 --- a/pytest_tests/testsuites/container/test_container.py +++ b/pytest_tests/testsuites/container/test_container.py @@ -4,7 +4,7 @@ from time import sleep import allure import pytest -from contract_keywords import tick_epoch +from epoch import tick_epoch from python_keywords.container import create_container, get_container, list_containers, delete_container from utility import placement_policy_from_container diff --git a/pytest_tests/testsuites/network/test_node_management.py b/pytest_tests/testsuites/network/test_node_management.py index 7938a07..92fc97f 100644 --- a/pytest_tests/testsuites/network/test_node_management.py +++ b/pytest_tests/testsuites/network/test_node_management.py @@ -6,7 +6,7 @@ import allure import pytest from common import (COMPLEX_OBJ_SIZE, MAINNET_BLOCK_TIME, NEOFS_CONTRACT_CACHE_TIMEOUT, NEOFS_NETMAP_DICT, SHARD_0_GC_SLEEP) -from contract_keywords import tick_epoch +from epoch import tick_epoch from utility_keywords import generate_file from python_keywords.container import create_container, get_container from python_keywords.neofs_verbs import (delete_object, get_object, diff --git a/robot/variables/common.py b/robot/variables/common.py index a4f77dd..fb1f83d 100644 --- a/robot/variables/common.py +++ b/robot/variables/common.py @@ -85,8 +85,6 @@ IR_WALLET_CONFIG = f"{os.getcwd()}/neofs_cli_configs/one_wallet_password.yml" IR_WALLET_PASS = 'one' STORAGE_WALLET_PATH = f"{DEVENV_SERVICES_PATH}/storage/wallet01.json" -WALLET_PASS = f"{os.getcwd()}/wallet_pass.yml" - STORAGE_NODE_USER = os.getenv('STORAGE_NODE_USER', 'root') STORAGE_NODE_PWD = os.getenv('STORAGE_NODE_PWD') STORAGE_NODE_BIN_PATH = os.getenv('STORAGE_NODE_BIN_PATH', '/opt/dev-env/vendor/neofs-cli')