diff --git a/pytest_tests/testsuites/failovers/test_frostfs_failover_network.py b/pytest_tests/testsuites/failovers/test_frostfs_failover_network.py index 5c141582..b7a532aa 100644 --- a/pytest_tests/testsuites/failovers/test_frostfs_failover_network.py +++ b/pytest_tests/testsuites/failovers/test_frostfs_failover_network.py @@ -9,13 +9,7 @@ from frostfs_testlib import reporter from frostfs_testlib.healthcheck.interfaces import Healthcheck from frostfs_testlib.resources.wellknown_acl import EACL_PUBLIC_READ_WRITE, PUBLIC_ACL from frostfs_testlib.steps.cli.container import create_container -from frostfs_testlib.steps.cli.object import ( - get_object, - get_object_nodes, - neo_go_query_height, - put_object, - put_object_to_random_node, -) +from frostfs_testlib.steps.cli.object import get_object, get_object_nodes, neo_go_query_height, put_object, put_object_to_random_node from frostfs_testlib.steps.storage_object import delete_objects from frostfs_testlib.storage.cluster import ClusterNode from frostfs_testlib.storage.controllers import ClusterStateController @@ -63,14 +57,6 @@ class TestFailoverNetwork(ClusterTestBase): yield cluster_state_controller.restore_interfaces() - @pytest.fixture() - @allure.title("Delete file after test") - def delete_file_after_test(self) -> None: - yield - for path in file_wait_delete: - os.remove(path) - file_wait_delete.clear() - @pytest.fixture() def storage_objects( self, @@ -113,9 +99,7 @@ class TestFailoverNetwork(ClusterTestBase): storage_objects.append(storage_object) - yield storage_objects - - delete_objects(storage_objects, self.shell, self.cluster) + return storage_objects @allure.title("Block Storage node traffic") def test_block_storage_node_traffic( @@ -174,9 +158,7 @@ class TestFailoverNetwork(ClusterTestBase): assert node.storage_node not in new_nodes with reporter.step("Check object data is not corrupted"): - got_file_path = get_object( - wallet, cid, oid, endpoint=new_nodes[0].get_rpc_endpoint(), shell=self.shell - ) + got_file_path = get_object(wallet, cid, oid, endpoint=new_nodes[0].get_rpc_endpoint(), shell=self.shell) assert get_file_hash(source_file_path) == get_file_hash(got_file_path) with reporter.step(f"Unblock incoming traffic"): @@ -184,9 +166,7 @@ class TestFailoverNetwork(ClusterTestBase): with reporter.step(f"Unblock at host {node}"): cluster_state_controller.restore_traffic(node=node) block_node = [ - cluster_node - for cluster_node in self.cluster.cluster_nodes - if cluster_node.storage_node == node.storage_node + cluster_node for cluster_node in self.cluster.cluster_nodes if cluster_node.storage_node == node.storage_node ] blocked_nodes.remove(*block_node) sleep(wakeup_node_timeout) @@ -204,7 +184,6 @@ class TestFailoverNetwork(ClusterTestBase): cluster_state_controller: ClusterStateController, default_wallet: WalletInfo, restore_down_interfaces: None, - delete_file_after_test: None, storage_objects: list[StorageObjectInfo], ): storage_object = storage_objects[0] @@ -261,7 +240,6 @@ class TestFailoverNetwork(ClusterTestBase): cluster_state_controller: ClusterStateController, default_wallet: WalletInfo, restore_down_interfaces: None, - delete_file_after_test: None, storage_objects: list[StorageObjectInfo], simple_object_size: ObjectSize, ): @@ -289,7 +267,7 @@ class TestFailoverNetwork(ClusterTestBase): self.tick_epochs(1, alive_node=nodes_without_an_object[0].storage_node, wait_block=2) with reporter.step("Get object others node, expect false"): - with pytest.raises(RuntimeError, match="return code: 1"): + with pytest.raises(RuntimeError, match="rpc error"): get_object( wallet=default_wallet, cid=storage_object.cid, @@ -299,7 +277,7 @@ class TestFailoverNetwork(ClusterTestBase): ) with reporter.step("Put object, others node, expect false"): - with pytest.raises(RuntimeError, match="return code: 1"): + with pytest.raises(RuntimeError, match="rpc error"): put_object( wallet=default_wallet, path=storage_object.file_path, @@ -345,7 +323,6 @@ class TestFailoverNetwork(ClusterTestBase): cluster_state_controller: ClusterStateController, default_wallet: WalletInfo, simple_object_size: ObjectSize, - delete_file_after_test: None, restore_down_interfaces: None, block_interface: Interfaces, other_interface: Interfaces, @@ -401,7 +378,6 @@ class TestFailoverNetwork(ClusterTestBase): cluster_state_controller: ClusterStateController, default_wallet: WalletInfo, simple_object_size: ObjectSize, - delete_file_after_test: None, restore_down_interfaces: None, interface: Interfaces, ):