mmalygina/frostfs-testcases
1
0
Fork 0
forked from TrueCloudLab/frostfs-testcases
Code Pull requests Activity

small fixes after [#237]

Browse source 
Signed-off-by: anastasia prasolova <anastasia@nspcc.ru>
This commit is contained in:
anastasia prasolova 2022-06-29 01:20:27 +03:00 committed by Anastasia Prasolova
parent 3ffa4f4534
commit 82139e30a0
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
neofs_cli_configs/mainnet_wallet_passwd.yml
View file

@ -1 +0,0 @@
password: "one"

0
neofs_cli_configs/ir_wallet_passwd.yml → neofs_cli_configs/one_wallet_password.yml
View file

6
robot/resources/lib/python_keywords/payment_neogo.py
View file

@ -50,7 +50,7 @@ def withdraw_mainnet_gas(wlt: str, amount: int):
raise Exception("Can not get Tx.")
tx = m.group(1)
if not transaction_accepted(tx):
raise RuntimeError(f"TX {tx} hasn't been processed")
raise AssertionError(f"TX {tx} hasn't been processed")
def transaction_accepted(tx_id: str):
@ -121,7 +121,7 @@ def transfer_mainnet_gas(wallet_to: str, amount: int, wallet_password: str = EMP
txid = nep17_transfer(MAINNET_WALLET_PATH, address_to, amount, NEO_MAINNET_ENDPOINT,
wallet_pass=MAINNET_WALLET_PASS, addr_from=MAINNET_SINGLE_ADDR)
if not transaction_accepted(txid):
raise RuntimeError(f"TX {txid} hasn't been processed")
raise AssertionError(f"TX {txid} hasn't been processed")
@keyword('NeoFS Deposit')
@ -138,7 +138,7 @@ def neofs_deposit(wallet_to: str, amount: int, wallet_password: str = EMPTY_PASS
txid = nep17_transfer(wallet_to, deposit_addr, amount, NEO_MAINNET_ENDPOINT,
wallet_pass=wallet_password, addr_from=address_to)
if not transaction_accepted(txid):
raise RuntimeError(f"TX {txid} hasn't been processed")
raise AssertionError(f"TX {txid} hasn't been processed")
def _address_from_wallet(wlt: str, wallet_password: str):
"""

10
robot/variables/common.py
View file

@ -1,16 +1,10 @@
import os
ROOT = '../..'
CERT = "%s/../../ca" % ROOT
# Common NeoFS variables can be declared from neofs-dev-env env variables.
# High priority is accepted for those envs.
CONTAINER_WAIT_INTERVAL = "1m"
NEOFS_EPOCH_TIMEOUT = (os.getenv("NEOFS_EPOCH_TIMEOUT") if os.getenv("NEOFS_EPOCH_TIMEOUT")
else os.getenv("NEOFS_IR_TIMERS_EPOCH", "300s"))
SIMPLE_OBJ_SIZE = 1000
COMPLEX_OBJ_SIZE = 2000
@ -70,10 +64,10 @@ NEOFS_CLI_EXEC = os.getenv('NEOFS_CLI_EXEC', 'neofs-cli')
WALLET_CONFIG = f"{os.getcwd()}/neofs_cli_configs/empty_passwd.yml"
MAINNET_WALLET_PATH = f"{DEVENV_SERVICES_PATH}/chain/node-wallet.json"
MAINNET_WALLET_CONFIG = f"{os.getcwd()}/neofs_cli_configs/mainnet_wallet_passwd.yml"
MAINNET_WALLET_CONFIG = f"{os.getcwd()}/neofs_cli_configs/one_wallet_password.yml"
MAINNET_SINGLE_ADDR = 'NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP'
MAINNET_WALLET_PASS = 'one'
IR_WALLET_PATH = f"{DEVENV_SERVICES_PATH}/ir/wallet01.json"
IR_WALLET_CONFIG = f"{os.getcwd()}/neofs_cli_configs/ir_wallet_passwd.yml"
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"