YDB FQ: stabilize MySQL tests (#6728)

Author: vitalyisaev2

ydb/library/yql/providers/generic/connector/tests/datasource/mysql/test.py

@@ -1,3 +1,7 @@
+from typing import Set
+from datetime import datetime
+import time
+
 import pytest
 
 import yatest.common
@@ -28,6 +32,23 @@
 class OneTimeWaiter:
     __launched: bool = False
 
+    __expected_tables: Set[str] = {
+        'column_selection_A_b_C_d_E',
+        'column_selection_COL1',
+        'column_selection_col1',
+        'column_selection_asterisk',
+        'column_selection_col2_COL1',
+        'column_selection_col2_col1',
+        'column_selection_col2',
+        'column_selection_col3',
+        'primitives',
+        'constant',
+        'count_rows',
+        'pushdown',
+        'json',
+        'datetimes',
+    }
+
     def __init__(self):
         docker_compose_file_relative_path = str(docker_compose_dir / 'docker-compose.yml')
         docker_compose_file_abs_path = yatest.common.source_path(docker_compose_file_relative_path)
@@ -37,8 +58,22 @@ def wait(self):
         if self.__launched:
             return
 
-        self.docker_compose_helper.await_mysql()
-        self.__launched = True
+        start = datetime.now()
+        actual_tables: Set[str] = None
+        timeout = 60
+
+        while (datetime.now() - start).total_seconds() < timeout:
+            try:
+                actual_tables = set(self.docker_compose_helper.list_mysql_tables())
+            except Exception as e:
+                LOGGER.error(f"list mysql tables error: {e}")
+                time.sleep(5)
+            else:
+                if self.__expected_tables.issubset(actual_tables):
+                    self.__launched = True
+                    return
+
+        raise RuntimeError(f"No expected tables in MySQL. Latest result: {actual_tables}")
 
 
 one_time_waiter = OneTimeWaiter()

ydb/library/yql/providers/generic/connector/tests/utils/docker_compose.py

@@ -5,7 +5,6 @@
 import socket
 import subprocess
 import yaml
-import time
 from typing import Dict, Any, Sequence
 
 import yatest.common
@@ -159,32 +158,28 @@ def list_ydb_tables(self) -> Sequence[str]:
 
         return result
 
-    def await_mysql(self):
+    def list_mysql_tables(self) -> Sequence[str]:
         params = self.docker_compose_yml_data["services"]["mysql"]
+        password = params["environment"]["MYSQL_ROOT_PASSWORD"]
+        db = params["environment"]["MYSQL_DATABASE"]
         cmd = [
             self.docker_bin_path,
             'exec',
             params["container_name"],
             'mysql',
-            f'--password={params["environment"]["MYSQL_ROOT_PASSWORD"]}',
-            f'{params["environment"]["MYSQL_DATABASE"]}',
+            f'--password={password}',
+            db,
             '-e',
-            'SELECT version()',
+            f'SELECT table_name FROM information_schema.tables WHERE table_schema = "{db}"',
         ]
 
         LOGGER.debug("calling command: " + " ".join(cmd))
 
-        err = RuntimeError("docker-compose error: timed out to check cmd output")  # default error value
-        start = datetime.now()
-        timeout = 20
+        out = None
 
-        while (datetime.now() - start).total_seconds() < timeout:
-            try:
-                subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode('utf8')
-                return
-            except subprocess.CalledProcessError as e:
-                LOGGER.error(f"called process error: {e}")
-                err = RuntimeError(f"docker-compose error: {e.output} (code {e.returncode})")
-                time.sleep(5)
-
-        raise err
+        try:
+            out = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode('utf8')
+        except subprocess.CalledProcessError as e:
+            raise RuntimeError(f"docker cmd failed: {e.output} (code {e.returncode})")
+        else:
+            return out.splitlines()[2:]