Adjust tests for docker in docker.

Author: tillahoffmann

testcontainers/compose.py

@@ -13,7 +13,8 @@ def __init__(self, filepath, compose_file_name="docker-compose.yml"):
         self.compose_file_name = compose_file_name
 
     def __enter__(self):
-        return self.start()
+        self.start()
+        return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.stop()

tests/test_docker_compose.py

@@ -1,35 +1,25 @@
-import os
-
 import pytest
 
 from testcontainers.compose import DockerCompose
 from testcontainers.core.exceptions import NoSuchPortExposed
+from testcontainers.core.utils import inside_container
 
 
 def test_can_spawn_service_via_compose():
-    compose = DockerCompose(os.path.dirname(__file__))
-
-    try:
-        compose.start()
+    with DockerCompose("tests") as compose:
         host = compose.get_service_host("hub", 4444)
         port = compose.get_service_port("hub", 4444)
         assert host == "0.0.0.0"
         assert port == "4444"
-    finally:
-        compose.stop()
 
 
 def test_can_throw_exception_if_no_port_exposed():
-    compose = DockerCompose(os.path.dirname(__file__))
-
-    compose.start()
-    with pytest.raises(NoSuchPortExposed):
-        compose.get_service_host("hub", 5555)
-
-    compose.stop()
+    with DockerCompose("tests") as compose:
+        with pytest.raises(NoSuchPortExposed):
+            compose.get_service_host("hub", 5555)
 
 
 def test_compose_wait_for_container_ready():
-    compose = DockerCompose(os.path.dirname(__file__))
-    with compose:
-        compose.wait_for("http://localhost:4444/wd/hub")
+    with DockerCompose("tests") as compose:
+        host = "host.docker.internal" if inside_container() else "localhost"
+        compose.wait_for("http://%s:4444/wd/hub" % host)

tests/test_new_docker_api.py

@@ -1,10 +1,11 @@
 import os
+import re
 from pathlib import Path
 
 from testcontainers import mysql
 
 from testcontainers.core.generic import GenericContainer
-
+from testcontainers.core.utils import inside_container
 from importlib import reload
 
 
@@ -30,7 +31,10 @@ def test_docker_env_variables():
     db.with_bind_ports(3306, 32785)
     with db:
         url = db.get_connection_url()
-        assert url == 'mysql+pymysql://demo:test@localhost:32785/custom_db'
+        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'
 
 
 def test_docker_kargs():