24479625a2
On macOS, Docker Desktop installs the CLI to /usr/local/bin/docker, but when Hermes runs as a gateway service (launchd) or in other non-login contexts, /usr/local/bin is often not in PATH. This causes the Docker requirements check to fail with 'No such file or directory: docker' even though docker works fine from the user's terminal. Add find_docker() helper that uses shutil.which() first, then probes common Docker Desktop install paths on macOS (/usr/local/bin, /opt/homebrew/bin, Docker.app bundle). The resolved path is cached and passed to mini-swe-agent via its 'executable' parameter. - tools/environments/docker.py: add find_docker(), use it in _storage_opt_supported() and pass to _Docker(executable=...) - tools/terminal_tool.py: use find_docker() in requirements check - tests/tools/test_docker_find.py: 4 tests (PATH, fallback, not found, cache) 2877 tests pass.
49 lines
1.9 KiB
Python
49 lines
1.9 KiB
Python
"""Tests for tools.environments.docker.find_docker — Docker CLI discovery."""
|
|
|
|
import os
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
from tools.environments import docker as docker_mod
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _reset_cache():
|
|
"""Clear the module-level docker executable cache between tests."""
|
|
docker_mod._docker_executable = None
|
|
yield
|
|
docker_mod._docker_executable = None
|
|
|
|
|
|
class TestFindDocker:
|
|
def test_found_via_shutil_which(self):
|
|
with patch("tools.environments.docker.shutil.which", return_value="/usr/bin/docker"):
|
|
result = docker_mod.find_docker()
|
|
assert result == "/usr/bin/docker"
|
|
|
|
def test_not_in_path_falls_back_to_known_locations(self, tmp_path):
|
|
# Create a fake docker binary at a known path
|
|
fake_docker = tmp_path / "docker"
|
|
fake_docker.write_text("#!/bin/sh\n")
|
|
fake_docker.chmod(0o755)
|
|
|
|
with patch("tools.environments.docker.shutil.which", return_value=None), \
|
|
patch("tools.environments.docker._DOCKER_SEARCH_PATHS", [str(fake_docker)]):
|
|
result = docker_mod.find_docker()
|
|
assert result == str(fake_docker)
|
|
|
|
def test_returns_none_when_not_found(self):
|
|
with patch("tools.environments.docker.shutil.which", return_value=None), \
|
|
patch("tools.environments.docker._DOCKER_SEARCH_PATHS", ["/nonexistent/docker"]):
|
|
result = docker_mod.find_docker()
|
|
assert result is None
|
|
|
|
def test_caches_result(self):
|
|
with patch("tools.environments.docker.shutil.which", return_value="/usr/local/bin/docker"):
|
|
first = docker_mod.find_docker()
|
|
# Second call should use cache, not call shutil.which again
|
|
with patch("tools.environments.docker.shutil.which", return_value=None):
|
|
second = docker_mod.find_docker()
|
|
assert first == second == "/usr/local/bin/docker"
|