fixed startup container and wait it

Author: rekby

docker-compose-tls.yml

@@ -10,5 +10,4 @@ services:
     volumes:
     - ./ydb_certs:/ydb_certs
     environment:
-      - YDB_USE_IN_MEMORY_PDISKS=true
       - YDB_ENABLE_COLUMN_TABLES=true

docker-compose.yml

@@ -7,5 +7,4 @@ services:
       - 2136:2136
     hostname: localhost
     environment:
-      - YDB_USE_IN_MEMORY_PDISKS=true
       - YDB_ENABLE_COLUMN_TABLES=true

tests/aio/query/test_query_session_pool.py

@@ -6,6 +6,7 @@
 
 from typing import Optional
 
+from tests.conftest import wait_container_ready_async
 from ydb.aio.query.pool import QuerySessionPool
 from ydb.aio.query.session import QuerySession, QuerySessionStateEnum
 from ydb.aio.query.transaction import QueryTxContext
@@ -164,6 +165,7 @@ async def test_no_session_leak(self, driver, docker_project):
 
         docker_project.start()
         await pool.stop()
+        await wait_container_ready_async(driver)
 
     @pytest.mark.asyncio
     async def test_acquire_no_race_condition(self, driver):

tests/aio/test_connection_pool.py

@@ -1,6 +1,7 @@
 import asyncio
 from unittest.mock import MagicMock
 
+from tests.conftest import wait_container_ready_async
 from ydb.aio.driver import Driver
 import pytest
 import ydb
@@ -109,6 +110,7 @@ async def restart_docker():
 
     docker_project.start()
     await driver.stop()
+    await wait_container_ready_async(driver)
 
 
 @pytest.mark.asyncio
@@ -133,6 +135,7 @@ async def test_disconnect_by_call(endpoint, database, docker_project):
     assert len(driver._store.connections) == 0
     docker_project.start()
     await driver.stop()
+    await wait_container_ready_async(driver)
 
 
 @pytest.mark.asyncio

tests/aio/test_session_pool.py

@@ -2,6 +2,7 @@
 
 import pytest
 import ydb
+from tests.conftest import wait_container_ready_async
 
 
 @pytest.mark.asyncio
@@ -90,6 +91,7 @@ async def test_no_cluster_endpoints_no_failure(driver, docker_project):
     await pool.release(sess)
     assert pool._active_count == 0
     await pool.stop()
+    await wait_container_ready_async(driver)
 
 
 @pytest.mark.asyncio
@@ -144,3 +146,4 @@ async def test_no_session_leak(driver, docker_project):
 
     docker_project.start()
     await pool.stop()
+    await wait_container_ready_async(driver)

tests/conftest.py

@@ -1,3 +1,4 @@
+import asyncio
 import os
 
 import pytest
@@ -30,6 +31,25 @@ def wait_container_ready(driver):
     raise RuntimeError("Container is not ready after timeout.")
 
 
+async def wait_container_ready_async(driver):
+    await driver.wait(timeout=30)
+
+    async with ydb.aio.SessionPool(driver, 1) as pool:
+
+        started_at = time.time()
+        while time.time() - started_at < 120:
+            try:
+                async with pool.checkout() as session:
+                    await session.execute_scheme("create table `.sys_health/test_table` (A int32, primary key(A));")
+
+                return True
+
+            except ydb.Error:
+                await asyncio.sleep(1)
+
+    raise RuntimeError("Container is not ready after timeout.")
+
+
 @pytest.fixture(scope="module")
 def endpoint(pytestconfig, module_scoped_container_getter):
     with ydb.Driver(endpoint="localhost:2136", database="/local") as driver:

tests/query/test_query_session_pool.py

@@ -7,6 +7,7 @@
 
 from typing import Optional
 
+from tests.conftest import wait_container_ready
 from ydb.query.pool import QuerySessionPool
 from ydb.query.session import QuerySession, QuerySessionStateEnum
 from ydb.query.transaction import QueryTxContext
@@ -150,6 +151,7 @@ def test_no_session_leak(self, driver_sync, docker_project):
 
         docker_project.start()
         pool.stop()
+        wait_container_ready(driver)
 
     def test_execute_with_retries_async(self, pool: QuerySessionPool):
         fut = pool.execute_with_retries_async("select 1;")