From 93519c5a29d0c5dc8fa340c855fdcb91bec29abd Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <felixoid@clickhouse.com>
Date: Tue, 1 Oct 2024 11:47:17 +0200
Subject: [PATCH] Fix compose v1 naming scheme

---
 tests/integration/test_dotnet_client/test.py  | 10 ++---
 tests/integration/test_mysql_protocol/test.py | 38 ++++++-------------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/tests/integration/test_dotnet_client/test.py b/tests/integration/test_dotnet_client/test.py
index 86461eb6442..c74f55c7b1a 100644
--- a/tests/integration/test_dotnet_client/test.py
+++ b/tests/integration/test_dotnet_client/test.py
@@ -38,20 +38,16 @@ def dotnet_container():
         DOCKER_COMPOSE_PATH, "docker_compose_dotnet_client.yml"
     )
     run_and_check(
-        [
-            "docker",
-            "compose",
-            "-p",
-            cluster.project_name,
+        cluster.compose_cmd(
             "-f",
             docker_compose,
             "up",
             "--force-recreate",
             "-d",
             "--no-build",
-        ]
+        )
     )
-    yield docker.from_env().containers.get(cluster.project_name + "_dotnet1_1")
+    yield docker.from_env().containers.get(cluster.get_instance_docker_id("dotnet1"))
 
 
 def test_dotnet_client(started_cluster, dotnet_container):
diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index 29af28cbd25..cfadc27a2b5 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -51,9 +51,7 @@ def golang_container():
         DOCKER_COMPOSE_PATH, "docker_compose_mysql_golang_client.yml"
     )
     run_and_check(
-        [
-            "docker",
-            "compose",
+        cluster.compose_cmd(
             "-p",
             cluster.project_name,
             "-f",
@@ -62,13 +60,13 @@ def golang_container():
             "--force-recreate",
             "-d",
             "--no-build",
-        ]
+        )
     )
     yield docker.DockerClient(
         base_url="unix:///var/run/docker.sock",
         version=cluster.docker_api_version,
         timeout=600,
-    ).containers.get(cluster.project_name + "_golang1_1")
+    ).containers.get(cluster.get_instance_docker_id("golang1"))
 
 
 @pytest.fixture(scope="module")
@@ -77,26 +75,22 @@ def php_container():
         DOCKER_COMPOSE_PATH, "docker_compose_mysql_php_client.yml"
     )
     run_and_check(
-        [
-            "docker",
-            "compose",
+        cluster.compose_cmd(
             "--env-file",
             cluster.instances["node"].env_file,
-            "-p",
-            cluster.project_name,
             "-f",
             docker_compose,
             "up",
             "--force-recreate",
             "-d",
             "--no-build",
-        ]
+        )
     )
     yield docker.DockerClient(
         base_url="unix:///var/run/docker.sock",
         version=cluster.docker_api_version,
         timeout=600,
-    ).containers.get(cluster.project_name + "_php1_1")
+    ).containers.get(cluster.get_instance_docker_id("php1"))
 
 
 @pytest.fixture(scope="module")
@@ -105,26 +99,22 @@ def nodejs_container():
         DOCKER_COMPOSE_PATH, "docker_compose_mysql_js_client.yml"
     )
     run_and_check(
-        [
-            "docker",
-            "compose",
+        cluster.compose_cmd(
             "--env-file",
             cluster.instances["node"].env_file,
-            "-p",
-            cluster.project_name,
             "-f",
             docker_compose,
             "up",
             "--force-recreate",
             "-d",
             "--no-build",
-        ]
+        )
     )
     yield docker.DockerClient(
         base_url="unix:///var/run/docker.sock",
         version=cluster.docker_api_version,
         timeout=600,
-    ).containers.get(cluster.project_name + "_mysqljs1_1")
+    ).containers.get(cluster.get_instance_docker_id("mysqljs1"))
 
 
 @pytest.fixture(scope="module")
@@ -133,26 +123,22 @@ def java_container():
         DOCKER_COMPOSE_PATH, "docker_compose_mysql_java_client.yml"
     )
     run_and_check(
-        [
-            "docker",
-            "compose",
+        cluster.compose_cmd(
             "--env-file",
             cluster.instances["node"].env_file,
-            "-p",
-            cluster.project_name,
             "-f",
             docker_compose,
             "up",
             "--force-recreate",
             "-d",
             "--no-build",
-        ]
+        )
     )
     yield docker.DockerClient(
         base_url="unix:///var/run/docker.sock",
         version=cluster.docker_api_version,
         timeout=600,
-    ).containers.get(cluster.project_name + "_java1_1")
+    ).containers.get(cluster.get_instance_docker_id("java1"))
 
 
 def test_mysql_client(started_cluster):