Merge pull request #23671 from ricardobranco777/dockerpy3366

python_docker: Backport PR#3366

Author: ricardobranco777

data/containers/patches.yaml

@@ -149,21 +149,25 @@ docker-py:
   # https://github.com/docker/docker-py/pull/3231 - Bump default API version to 1.44 (Moby 25.0)
   # https://github.com/docker/docker-py/pull/3290 - tests/exec: expect 127 exit code for missing executable
   # https://github.com/docker/docker-py/pull/3354 - tests: Fix deprecation warning for utcfromtimestamp()
+  # https://github.com/docker/docker-py/pull/3366 - test: Skip from_env_unix tests if DOCKER_HOST is network socket
   opensuse-Tumbleweed:
     GITHUB_PATCHES:
     - 3290
     - 3354
+    - 3366
   sle-16.0:
     GITHUB_PATCHES:
     - 3290
     - 3354
+    - 3366
   sle-15-SP7:
     GITHUB_PATCHES:
     - 3199
     - 3203
     - 3206
     - 3231
     - 3290
+    - 3366
 netavark:
   # Note on patches:
   # https://github.com/containers/netavark/pull/1191 is needed for 001-basic

data/containers/patches/docker-py/3366.patch

@@ -0,0 +1,35 @@
+From cf97720bd35c718552e60c8c4f085bc94744e054 Mon Sep 17 00:00:00 2001
+From: Ricardo Branco <[email protected]>
+Date: Sat, 18 Oct 2025 11:32:43 +0200
+Subject: [PATCH] test: Skip from_env_unix tests if DOCKER_HOST is network
+ socket
+
+Signed-off-by: Ricardo Branco <[email protected]>
+---
+ tests/unit/client_test.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/unit/client_test.py b/tests/unit/client_test.py
+index 60a6d5c0f5..5ba712d240 100644
+--- a/tests/unit/client_test.py
++++ b/tests/unit/client_test.py
+@@ -188,7 +188,8 @@ def test_from_env_without_timeout_uses_default(self):
+         assert client.api.timeout == DEFAULT_TIMEOUT_SECONDS
+ 
+     @pytest.mark.skipif(
+-        IS_WINDOWS_PLATFORM, reason='Unix Connection Pool only on Linux'
++        os.environ.get('DOCKER_HOST', '').startswith('tcp://') or IS_WINDOWS_PLATFORM,
++        reason='Requires a Unix socket'
+     )
+     @mock.patch("docker.transport.unixconn.UnixHTTPConnectionPool")
+     def test_default_pool_size_from_env_unix(self, mock_obj):
+@@ -219,7 +220,8 @@ def test_default_pool_size_from_env_win(self, mock_obj):
+                                          )
+ 
+     @pytest.mark.skipif(
+-        IS_WINDOWS_PLATFORM, reason='Unix Connection Pool only on Linux'
++        os.environ.get('DOCKER_HOST', '').startswith('tcp://') or IS_WINDOWS_PLATFORM,
++        reason='Requires a Unix socket'
+     )
+     @mock.patch("docker.transport.unixconn.UnixHTTPConnectionPool")
+     def test_pool_size_from_env_unix(self, mock_obj):

tests/containers/python_docker.pm

@@ -63,11 +63,7 @@ sub test ($target) {
 
     # Used by pytest to ignore individual tests
     # Format: "FILE::CLASS::FUNCTION"
-    my @deselect = (
-        # These tests will fail if DOCKER_HOST is set
-        "tests/unit/client_test.py::FromEnvTest::test_default_pool_size_from_env_unix",
-        "tests/unit/client_test.py::FromEnvTest::test_pool_size_from_env_unix",
-    );
+    my @deselect = ();
     my $deselect = join " ", map { "--deselect=$_" } @deselect;
 
     my %env = (