dstepanov-yadro/frostfs-testcases
1
0
Fork 0
forked from TrueCloudLab/frostfs-testcases
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add missed shell parameter in wait_for_expected_object_copies()

Browse source 
Signed-off-by: Vladimir Avdeev <v.avdeev@yadro.com>
This commit is contained in:
Vladimir Avdeev 2022-10-28 11:22:27 +03:00 committed by Vladimir
parent ecd5cd1252
commit 9e2f8dfb00
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pytest_tests/testsuites/network/test_node_management.py
View file

@ -369,7 +369,7 @@ def test_replication(
node_names = [name for name, config in NEOFS_NETMAP_DICT.items() if config.get("rpc") in nodes] node_names = [name for name, config in NEOFS_NETMAP_DICT.items() if config.get("rpc") in nodes]
stopped_nodes = stop_nodes(hosting, 1, node_names) stopped_nodes = stop_nodes(hosting, 1, node_names)
wait_for_expected_object_copies(wallet, cid, oid) wait_for_expected_object_copies(client_shell, wallet, cid, oid)
start_nodes(hosting, stopped_nodes) start_nodes(hosting, stopped_nodes)
tick_epoch(shell=client_shell) tick_epoch(shell=client_shell)
@ -377,7 +377,7 @@ def test_replication(
for node_name in node_names: for node_name in node_names:
wait_for_node_go_online(hosting, node_name) wait_for_node_go_online(hosting, node_name)
wait_for_expected_object_copies(wallet, cid, oid) wait_for_expected_object_copies(client_shell, wallet, cid, oid)
@pytest.mark.node_mgmt @pytest.mark.node_mgmt
@ -508,13 +508,13 @@ def wait_for_node_to_be_ready(hosting: Hosting, node_name: str) -> None:
@allure.step("Wait for {expected_copies} object copies in the wallet") @allure.step("Wait for {expected_copies} object copies in the wallet")
def wait_for_expected_object_copies( def wait_for_expected_object_copies(
wallet: str, cid: str, oid: str, expected_copies: int = 2 shell: Shell, wallet: str, cid: str, oid: str, expected_copies: int = 2
) -> None: ) -> None:
for i in range(2): for i in range(2):
copies = get_simple_object_copies(wallet, cid, oid) copies = get_simple_object_copies(wallet, cid, oid)
if copies == expected_copies: if copies == expected_copies:
break break
tick_epoch() tick_epoch(shell=shell)
sleep(parse_time(NEOFS_CONTRACT_CACHE_TIMEOUT)) sleep(parse_time(NEOFS_CONTRACT_CACHE_TIMEOUT))
else: else:
raise AssertionError(f"There are no {expected_copies} copies during time") raise AssertionError(f"There are no {expected_copies} copies during time")