Merge branch 'ci-gh-actions' of github.com:conan-io/conan into ci-gh-…

…actions
conan-io · Oct 1, 2024 · 6b102fc · 6b102fc
2 parents 13d080f + 31c7f45
commit 6b102fc
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/test/functional/command/runner_test.py b/test/functional/command/runner_test.py
@@ -9,18 +9,15 @@
 
 def docker_skip(test_image=None):
     try:
-        try:
-            docker_client = docker.from_env()
-        except:
-            docker_client = docker.DockerClient(base_url=f'unix://{os.path.expanduser("~")}/.rd/docker.sock', version='auto') # Rancher
+        docker_client = docker.from_env()
         if test_image:
             docker_client.images.pull(test_image)
-    except docker.errors.DockerException:
-        return True
-    except docker.errors.ImageNotFound:
-        return True
-    except docker.errors.APIError:
-        return True
+    except docker.errors.DockerException as e:
+        raise e
+    except docker.errors.ImageNotFound as e:
+        raise e
+    except docker.errors.APIError as e:
+        raise e
     return False