Post-rebase fixes.
This commit is contained in:
parent
7f0dcbfdca
commit
cd53f48c15
4 changed files with 3 additions and 5 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit 1d7ebe1d6d4bb6c8ce62f36091347bddb54d333b
|
Subproject commit 58650099362f05b51b97f04e2244a4ba20f88351
|
|
@ -4,7 +4,7 @@ from time import sleep
|
||||||
import allure
|
import allure
|
||||||
import pytest
|
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 python_keywords.container import create_container, get_container, list_containers, delete_container
|
||||||
from utility import placement_policy_from_container
|
from utility import placement_policy_from_container
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import allure
|
||||||
import pytest
|
import pytest
|
||||||
from common import (COMPLEX_OBJ_SIZE, MAINNET_BLOCK_TIME, NEOFS_CONTRACT_CACHE_TIMEOUT,
|
from common import (COMPLEX_OBJ_SIZE, MAINNET_BLOCK_TIME, NEOFS_CONTRACT_CACHE_TIMEOUT,
|
||||||
NEOFS_NETMAP_DICT, SHARD_0_GC_SLEEP)
|
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 utility_keywords import generate_file
|
||||||
from python_keywords.container import create_container, get_container
|
from python_keywords.container import create_container, get_container
|
||||||
from python_keywords.neofs_verbs import (delete_object, get_object,
|
from python_keywords.neofs_verbs import (delete_object, get_object,
|
||||||
|
|
|
@ -85,8 +85,6 @@ IR_WALLET_CONFIG = f"{os.getcwd()}/neofs_cli_configs/one_wallet_password.yml"
|
||||||
IR_WALLET_PASS = 'one'
|
IR_WALLET_PASS = 'one'
|
||||||
STORAGE_WALLET_PATH = f"{DEVENV_SERVICES_PATH}/storage/wallet01.json"
|
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_USER = os.getenv('STORAGE_NODE_USER', 'root')
|
||||||
STORAGE_NODE_PWD = os.getenv('STORAGE_NODE_PWD')
|
STORAGE_NODE_PWD = os.getenv('STORAGE_NODE_PWD')
|
||||||
STORAGE_NODE_BIN_PATH = os.getenv('STORAGE_NODE_BIN_PATH', '/opt/dev-env/vendor/neofs-cli')
|
STORAGE_NODE_BIN_PATH = os.getenv('STORAGE_NODE_BIN_PATH', '/opt/dev-env/vendor/neofs-cli')
|
||||||
|
|
Loading…
Reference in a new issue