Skip to content

Commit 53bf9ed

Browse files
authored
Merge pull request #879 from jluebbe/fix-docker-tests
tests/test_docker: handle docker.errors.DockerException
2 parents 11609b7 + 39476ed commit 53bf9ed

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

tests/test_docker.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ def check_external_progs_present():
1717
"""Determine if host machine has a usable docker daemon"""
1818
try:
1919
import docker
20-
dock = docker.from_env()
21-
dock.info()
20+
try:
21+
dock = docker.from_env()
22+
dock.info()
23+
except docker.errors.DockerException:
24+
return False
2225
except OSError:
2326
return False
2427
return True

0 commit comments

Comments
 (0)