Add missed shell parameter in tick_epoch()

Signed-off-by: Vladimir Avdeev <v.avdeev@yadro.com>
This commit is contained in:
Vladimir Avdeev 2022-10-28 11:01:33 +03:00 committed by Vladimir Avdeev
parent 70a0f9f216
commit ecd5cd1252
2 changed files with 10 additions and 7 deletions

View file

@ -168,8 +168,9 @@ class TestStorageGroup:
oid = put_object(self.main_wallet, file_path, cid, shell=client_shell) oid = put_object(self.main_wallet, file_path, cid, shell=client_shell)
objects = [oid] objects = [oid]
storage_group = put_storagegroup(self.main_wallet, cid, objects, lifetime="1") storage_group = put_storagegroup(self.main_wallet, cid, objects, lifetime="1")
tick_epoch() with allure.step("Tick two epochs"):
tick_epoch() for _ in range(2):
tick_epoch(shell=client_shell)
with pytest.raises(Exception, match=OBJECT_NOT_FOUND): with pytest.raises(Exception, match=OBJECT_NOT_FOUND):
get_storagegroup(self.main_wallet, cid, storage_group) get_storagegroup(self.main_wallet, cid, storage_group)

View file

@ -109,7 +109,7 @@ def return_nodes(shell: Shell, hosting: Hosting, alive_node: Optional[str] = Non
sleep(parse_time(MORPH_BLOCK_TIME)) sleep(parse_time(MORPH_BLOCK_TIME))
for __attempt in range(3): for __attempt in range(3):
try: try:
tick_epoch() tick_epoch(shell=shell)
break break
except RuntimeError: except RuntimeError:
sleep(3) sleep(3)
@ -212,7 +212,7 @@ def test_nodes_management(prepare_tmp_dir, client_shell, hosting: Hosting):
node_set_status(hosting, random_node, status="offline") node_set_status(hosting, random_node, status="offline")
sleep(parse_time(MORPH_BLOCK_TIME)) sleep(parse_time(MORPH_BLOCK_TIME))
tick_epoch() tick_epoch(shell=client_shell)
with allure.step(f"Check node {random_node} went to offline"): with allure.step(f"Check node {random_node} went to offline"):
health_check = node_healthcheck(hosting, random_node) health_check = node_healthcheck(hosting, random_node)
@ -224,7 +224,7 @@ def test_nodes_management(prepare_tmp_dir, client_shell, hosting: Hosting):
node_set_status(hosting, random_node, status="online") node_set_status(hosting, random_node, status="online")
sleep(parse_time(MORPH_BLOCK_TIME)) sleep(parse_time(MORPH_BLOCK_TIME))
tick_epoch() tick_epoch(shell=client_shell)
with allure.step(f"Check node {random_node} went to online"): with allure.step(f"Check node {random_node} went to online"):
health_check = node_healthcheck(hosting, random_node) health_check = node_healthcheck(hosting, random_node)
@ -348,7 +348,9 @@ def test_placement_policy_negative(
@pytest.mark.skip(reason="We cover this scenario in failover tests") @pytest.mark.skip(reason="We cover this scenario in failover tests")
@pytest.mark.node_mgmt @pytest.mark.node_mgmt
@allure.title("NeoFS object replication on node failover") @allure.title("NeoFS object replication on node failover")
def test_replication(prepare_wallet_and_deposit, after_run_start_all_nodes, hosting: Hosting): def test_replication(
prepare_wallet_and_deposit, client_shell: Shell, after_run_start_all_nodes, hosting: Hosting
):
""" """
Test checks object replication on storage not failover and come back. Test checks object replication on storage not failover and come back.
""" """
@ -370,7 +372,7 @@ def test_replication(prepare_wallet_and_deposit, after_run_start_all_nodes, host
wait_for_expected_object_copies(wallet, cid, oid) wait_for_expected_object_copies(wallet, cid, oid)
start_nodes(hosting, stopped_nodes) start_nodes(hosting, stopped_nodes)
tick_epoch() tick_epoch(shell=client_shell)
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)