Merge pull request ClickHouse#79948 from ClickHouse/ncb/fix-cgroup-limit

fix flaky test_cgroup_limit

Author: bharatnc

tests/integration/test_cgroup_limit/test.py

@@ -1,12 +1,9 @@
-#!/usr/bin/env python3
-
 import logging
 import math
 import os
 import subprocess
-from tempfile import NamedTemporaryFile
 
-import pytest
+from helpers.test_tools import wait_condition
 
 
 def run_command_in_container(cmd, *args):
@@ -43,14 +40,17 @@ def run_with_cpu_limit(cmd, num_cpus, *args):
 
 def test_cgroup_cpu_limit():
     for num_cpus in (1, 2, 4, 2.8):
-        result = run_with_cpu_limit(
-            "clickhouse local -q \"select value from system.settings where name='max_threads'\"",
-            num_cpus,
-        )
-        expect_output = (r"\'auto({})\'".format(math.ceil(num_cpus))).encode()
-        assert (
-            result.strip() == expect_output
-        ), f"fail for cpu limit={num_cpus}, result={result.strip()}, expect={expect_output}"
+        def run_with_retry():
+            result = run_with_cpu_limit(
+                "clickhouse local -q \"select value from system.settings where name='max_threads'\"",
+                num_cpus,
+            )
+            expect_output = (r"\'auto({})\'".format(math.ceil(num_cpus))).encode()
+            return (
+                result.strip() == expect_output
+            ), f"fail for cpu limit={num_cpus}, result={result.strip()}, expect={expect_output}"
+
+        wait_condition(run_with_retry, lambda x:x, max_attempts=3, delay=0.2)
 
 
 # For manual run