add modifications

Author: alexanderankin

core/tests/test_docker_in_docker.py

@@ -3,6 +3,7 @@
 import os
 import time
 import socket
+import sys
 from pathlib import Path
 from typing import Final, Any, Generator
 
@@ -19,6 +20,13 @@
 from testcontainers.core.utils import is_mac
 from testcontainers.core.waiting_utils import wait_for_logs
 
+_DIND_PYTHON_VERSION = (3, 13)
+
+
+def _should_run_dind() -> bool:
+    # todo refine macos check -> run in ci but not locally
+    return not is_mac() and tuple([*sys.version_info][:2]) == _DIND_PYTHON_VERSION
+
 
 def _wait_for_dind_return_ip(client: DockerClient, dind: Container):
     # get ip address for DOCKER_HOST
@@ -38,7 +46,7 @@ def _wait_for_dind_return_ip(client: DockerClient, dind: Container):
     return docker_host_ip
 
 
-@pytest.mark.skipif(is_mac(), reason="Docker socket forwarding (socat) is unsupported on Docker Desktop for macOS")
+@pytest.mark.skipif(_should_run_dind(), reason="Docker socket forwarding (socat) is unsupported on Docker Desktop for macOS")
 def test_wait_for_logs_docker_in_docker():
     # real dind isn't possible (AFAIK) in CI
     # forwarding the socket to a container port is at least somewhat the same
@@ -68,7 +76,7 @@ def test_wait_for_logs_docker_in_docker():
 
 
 @pytest.mark.skipif(
-    is_mac(), reason="Bridge networking and Docker socket forwarding are not supported on Docker Desktop for macOS"
+    _should_run_dind(), reason="Bridge networking and Docker socket forwarding are not supported on Docker Desktop for macOS"
 )
 def test_dind_inherits_network():
     client = DockerClient()
@@ -152,7 +160,7 @@ def get_docker_info() -> dict[str, Any]:
 # see https://forums.docker.com/t/get-a-containers-full-id-from-inside-of-itself
 @pytest.mark.xfail(reason="Does not work in rootles docker i.e. github actions")
 @pytest.mark.inside_docker_check
-@pytest.mark.skipif(not os.environ.get(EXPECTED_NETWORK_VAR), reason="No expected network given")
+@pytest.mark.skipif(_should_run_dind() or not os.environ.get(EXPECTED_NETWORK_VAR), reason="No expected network given")
 def test_find_host_network_in_dood() -> None:
     """
     Check that the correct host network is found for DooD
@@ -165,7 +173,7 @@ def test_find_host_network_in_dood() -> None:
 
 
 @pytest.mark.skipif(
-    is_mac(), reason="Docker socket mounting and container networking do not work reliably on Docker Desktop for macOS"
+    _should_run_dind(), reason="Docker socket mounting and container networking do not work reliably on Docker Desktop for macOS"
 )
 @pytest.mark.skipif(not Path(tcc.ryuk_docker_socket).exists(), reason="No docker socket available")
 def test_dood(python_testcontainer_image: str) -> None:
@@ -202,6 +210,9 @@ def test_dood(python_testcontainer_image: str) -> None:
     assert status["StatusCode"] == 0
 
 
+@pytest.mark.skipif(
+    _should_run_dind(), reason="Docker socket mounting and container networking do not work reliably on Docker Desktop for macOS"
+)
 def test_dind(python_testcontainer_image: str, tmp_path: Path) -> None:
     """
     Run selected tests in Docker in Docker