From 4f989e4260ce93ae59dc08fc006f510034a63144 Mon Sep 17 00:00:00 2001 From: Ilyas Niyazov Date: Fri, 17 Jan 2025 17:46:12 +0300 Subject: [PATCH] [#359] Run metrics tests before other tests Signed-off-by: Ilyas Niyazov --- pytest_tests/testsuites/conftest.py | 14 -------------- .../testsuites/metrics/test_container_metrics.py | 12 +++++++++++- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pytest_tests/testsuites/conftest.py b/pytest_tests/testsuites/conftest.py index 0290b870..a507147d 100644 --- a/pytest_tests/testsuites/conftest.py +++ b/pytest_tests/testsuites/conftest.py @@ -56,20 +56,6 @@ start_time = pytest.StashKey[int]() test_outcome = pytest.StashKey[str]() -# pytest hook. Do not rename -def pytest_collection_modifyitems(items: list[pytest.Item]): - # Change order of tests based on @pytest.mark.order() marker - def order(item: pytest.Item) -> int: - order_marker = item.get_closest_marker("order") - if order_marker and (len(order_marker.args) != 1 or not isinstance(order_marker.args[0], int)): - raise RuntimeError("Incorrect usage of pytest.mark.order") - - order_value = order_marker.args[0] if order_marker else 0 - return order_value - - items.sort(key=lambda item: order(item)) - - # pytest hook. Do not rename def pytest_collection_finish(session: pytest.Session): items_total = len(session.items) diff --git a/pytest_tests/testsuites/metrics/test_container_metrics.py b/pytest_tests/testsuites/metrics/test_container_metrics.py index aaad2721..2477e1fe 100644 --- a/pytest_tests/testsuites/metrics/test_container_metrics.py +++ b/pytest_tests/testsuites/metrics/test_container_metrics.py @@ -220,7 +220,17 @@ class TestContainerMetrics(ClusterTestBase): self.tick_epoch() wait_for_container_deletion(default_wallet, container, shell=self.shell, endpoint=cluster.default_rpc_endpoint) - with reporter.step(f"Check metrics value in each nodes, should not be show any result"): + with reporter.step(f"Check metric {metric_name} in each nodes, should not be show any result"): futures = parallel(self.get_metrics_search_by_greps_parallel, cluster.cluster_nodes, command=metric_name, cid=container) metrics_results = [future.result() for future in futures if future.result() is not None] assert len(metrics_results) == 0, f"Metrics value is not empty in Prometheus, actual value in nodes: {metrics_results}" + + with reporter.step("Check metric 'frostfs_node_engine_container_size_bytes' in each nodes, should not be show any result"): + futures = parallel( + self.get_metrics_search_by_greps_parallel, + cluster.cluster_nodes, + command="frostfs_node_engine_container_size_bytes", + cid=container, + ) + metrics_results = [future.result() for future in futures if future.result() is not None] + assert len(metrics_results) == 0, f"Metrics value is not empty, actual value in nodes: {metrics_results}"