From 5ddc31cca62b5eca1aa28dbdda2d6931f64d20af Mon Sep 17 00:00:00 2001 From: Dmitriy Zayakin Date: Wed, 10 Jan 2024 13:43:52 +0300 Subject: [PATCH] [#179] Change argument func Signed-off-by: Dmitriy Zayakin --- pytest_tests/testsuites/conftest.py | 5 ++--- .../testsuites/services/s3_gate/test_s3_multipart.py | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pytest_tests/testsuites/conftest.py b/pytest_tests/testsuites/conftest.py index 8d57ba7..72be007 100644 --- a/pytest_tests/testsuites/conftest.py +++ b/pytest_tests/testsuites/conftest.py @@ -41,6 +41,8 @@ from pytest_tests.resources.common import HOSTING_CONFIG_FILE, TEST_CYCLES_COUNT logger = logging.getLogger("NeoLogger") +SERVICE_ACTIVE_TIME = 20 + # Add logs check test even if it's not fit to mark selectors def pytest_configure(config: pytest.Config): markers = config.option.markexpr @@ -367,9 +369,6 @@ def after_deploy_healthcheck(cluster: Cluster): parallel(readiness_on_node, cluster.cluster_nodes) -SERVICE_ACTIVE_TIME = 20 - - @wait_for_success(60 * SERVICE_ACTIVE_TIME * 3, 60, title="Wait for {cluster_node} readiness") def readiness_on_node(cluster_node: ClusterNode): # TODO: Move to healtcheck classes diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_multipart.py b/pytest_tests/testsuites/services/s3_gate/test_s3_multipart.py index 89846a2..c6e28bb 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_multipart.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_multipart.py @@ -66,9 +66,10 @@ class TestS3GateMultipart(ClusterTestBase): upload_key = "multipart_abort" with reporter.step(f"Get related container_id for bucket '{bucket}'"): - container_id = search_container_by_name( - default_wallet, bucket, self.shell, self.cluster.default_rpc_endpoint - ) + for cluster_node in self.cluster.cluster_nodes: + container_id = search_container_by_name(bucket, cluster_node) + if container_id: + break with reporter.step("Create multipart upload"): upload_id = s3_client.create_multipart_upload(bucket, upload_key)