check test results correctly in docker:dind

Author: tuvshuud

tests/test_docker_compose.py

@@ -1,8 +1,8 @@
 import pytest
 
 from testcontainers.compose import DockerCompose
+from testcontainers.core.docker_client import DockerClient
 from testcontainers.core.exceptions import NoSuchPortExposed
-from testcontainers.core.utils import inside_container
 
 
 def test_can_spawn_service_via_compose():
@@ -29,5 +29,5 @@ def test_can_throw_exception_if_no_port_exposed():
 
 def test_compose_wait_for_container_ready():
     with DockerCompose("tests") as compose:
-        host = "host.docker.internal" if inside_container() else "localhost"
-        compose.wait_for("http://%s:4444/wd/hub" % host)
+        docker = DockerClient()
+        compose.wait_for("http://%s:4444/wd/hub" % docker.host())

tests/test_new_docker_api.py

@@ -31,10 +31,8 @@ def test_docker_env_variables():
     db.with_bind_ports(3306, 32785)
     with db:
         url = db.get_connection_url()
-        if inside_container():
-            assert re.match(r'mysql\+pymysql://demo:test@(\d+\.){3}\d+:3306/custom_db', url)
-        else:
-            assert url == 'mysql+pymysql://demo:test@localhost:32785/custom_db'
+        pattern = r'mysql\+pymysql:\/\/demo:test@[\w,.]+:(3306|32785)\/custom_db'
+        assert re.match(pattern, url)
 
 
 def test_docker_kargs():