Skip to content

Commit d147fc6

Browse files
committed
style: Fix linting errors and follow test file conventions
- Move imports to top level (mock, UNIX_SOCKET_PATHS, _find_available_unix_socket) - Remove unused imports inside test methods - Format mock.patch calls to follow line length conventions
1 parent 68363d3 commit d147fc6

File tree

1 file changed

+23
-28
lines changed

1 file changed

+23
-28
lines changed

tests/unit/utils_test.py

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,17 @@
55
import shutil
66
import tempfile
77
import unittest
8+
from unittest import mock
89

910
import pytest
1011

1112
from docker.api.client import APIClient
12-
from docker.constants import DEFAULT_DOCKER_API_VERSION, IS_WINDOWS_PLATFORM
13+
from docker.constants import (
14+
DEFAULT_DOCKER_API_VERSION,
15+
IS_WINDOWS_PLATFORM,
16+
UNIX_SOCKET_PATHS,
17+
)
18+
from docker.constants import _find_available_unix_socket
1319
from docker.errors import DockerException
1420
from docker.utils import (
1521
compare_version,
@@ -641,82 +647,71 @@ class UnixSocketDiscoveryTest(unittest.TestCase):
641647

642648
def test_find_socket_prefers_traditional_location(self):
643649
"""When /var/run/docker.sock exists, it should be preferred."""
644-
from unittest import mock
645-
from docker.constants import UNIX_SOCKET_PATHS, _find_available_unix_socket
646650

647651
def mock_exists(path):
648652
# All sockets exist - should prefer the first one
649653
return path in UNIX_SOCKET_PATHS
650654

651-
with mock.patch('docker.constants.os.path.exists', side_effect=mock_exists):
655+
with mock.patch("docker.constants.os.path.exists", side_effect=mock_exists):
652656
result = _find_available_unix_socket()
653657
assert result == "http+unix:///var/run/docker.sock"
654658

655659
def test_find_socket_falls_back_to_docker_desktop(self):
656660
"""When only ~/.docker/run/docker.sock exists, it should be used."""
657-
from unittest import mock
658-
from docker.constants import UNIX_SOCKET_PATHS, _find_available_unix_socket
659-
660-
docker_desktop_socket = os.path.expanduser('~/.docker/run/docker.sock')
661+
docker_desktop_socket = os.path.expanduser("~/.docker/run/docker.sock")
661662

662663
def mock_exists(path):
663664
# Only Docker Desktop v4.x+ socket exists
664665
return path == docker_desktop_socket
665666

666-
with mock.patch('docker.constants.os.path.exists', side_effect=mock_exists):
667+
with mock.patch("docker.constants.os.path.exists", side_effect=mock_exists):
667668
result = _find_available_unix_socket()
668669
assert result == f"http+unix://{docker_desktop_socket}"
669670

670671
def test_find_socket_falls_back_to_older_docker_desktop(self):
671672
"""When only ~/.docker/desktop/docker.sock exists, it should be used."""
672-
from unittest import mock
673-
from docker.constants import UNIX_SOCKET_PATHS, _find_available_unix_socket
674-
675-
older_desktop_socket = os.path.expanduser('~/.docker/desktop/docker.sock')
673+
older_desktop_socket = os.path.expanduser("~/.docker/desktop/docker.sock")
676674

677675
def mock_exists(path):
678676
# Only older Docker Desktop socket exists
679677
return path == older_desktop_socket
680678

681-
with mock.patch('docker.constants.os.path.exists', side_effect=mock_exists):
679+
with mock.patch("docker.constants.os.path.exists", side_effect=mock_exists):
682680
result = _find_available_unix_socket()
683681
assert result == f"http+unix://{older_desktop_socket}"
684682

685683
def test_find_socket_fallback_when_none_exist(self):
686684
"""When no socket exists, should fall back to traditional location."""
687-
from unittest import mock
688-
from docker.constants import _find_available_unix_socket
689685

690686
def mock_exists(path):
691687
# No sockets exist
692688
return False
693689

694-
with mock.patch('docker.constants.os.path.exists', side_effect=mock_exists):
690+
with mock.patch("docker.constants.os.path.exists", side_effect=mock_exists):
695691
result = _find_available_unix_socket()
696692
# Should fall back to traditional location for consistent error messages
697693
assert result == "http+unix:///var/run/docker.sock"
698694

699695
def test_find_socket_preference_order(self):
700696
"""Verify the preference order: traditional > docker desktop v4 > older desktop."""
701-
from unittest import mock
702-
from docker.constants import UNIX_SOCKET_PATHS, _find_available_unix_socket
703-
704-
docker_desktop_socket = os.path.expanduser('~/.docker/run/docker.sock')
705-
older_desktop_socket = os.path.expanduser('~/.docker/desktop/docker.sock')
697+
docker_desktop_socket = os.path.expanduser("~/.docker/run/docker.sock")
698+
older_desktop_socket = os.path.expanduser("~/.docker/desktop/docker.sock")
706699

707700
# Test: when docker desktop v4 and older both exist, v4 should win
708701
def mock_exists_v4_and_older(path):
709702
return path in [docker_desktop_socket, older_desktop_socket]
710703

711-
with mock.patch('docker.constants.os.path.exists', side_effect=mock_exists_v4_and_older):
704+
with mock.patch(
705+
"docker.constants.os.path.exists", side_effect=mock_exists_v4_and_older
706+
):
712707
result = _find_available_unix_socket()
713708
assert result == f"http+unix://{docker_desktop_socket}"
714709

715710
def test_unix_socket_paths_order(self):
716711
"""Verify UNIX_SOCKET_PATHS contains expected paths in correct order."""
717-
from docker.constants import UNIX_SOCKET_PATHS
718-
719712
assert len(UNIX_SOCKET_PATHS) == 3
720-
assert UNIX_SOCKET_PATHS[0] == '/var/run/docker.sock'
721-
assert UNIX_SOCKET_PATHS[1] == os.path.expanduser('~/.docker/run/docker.sock')
722-
assert UNIX_SOCKET_PATHS[2] == os.path.expanduser('~/.docker/desktop/docker.sock')
713+
assert UNIX_SOCKET_PATHS[0] == "/var/run/docker.sock"
714+
assert UNIX_SOCKET_PATHS[1] == os.path.expanduser("~/.docker/run/docker.sock")
715+
assert UNIX_SOCKET_PATHS[2] == os.path.expanduser(
716+
"~/.docker/desktop/docker.sock"
717+
)

0 commit comments

Comments
 (0)