GRM-10: refactor: deduplicate CLI, remove dead code, move validation to business layer

This commit is contained in:
Emil Simeonov
2026-06-19 00:57:26 +02:00
parent 4c08606d0c
commit b3ac955515
5 changed files with 151 additions and 164 deletions
+18
View File
@@ -37,6 +37,12 @@ class TestCLI:
@patch("gitea_runner_manager.cli.RunnerManager")
def test_install_missing_url(self, mock_manager_class: MagicMock) -> None:
mock_manager = MagicMock()
from gitea_runner_manager.exceptions import AnsibleError
mock_manager.install.side_effect = AnsibleError("GITEA_URL must be set (or pass --url)")
mock_manager_class.return_value = mock_manager
with patch.dict("os.environ", {"GITEA_REGISTRATION_TOKEN": "tok"}, clear=True):
runner = CliRunner()
result = runner.invoke(cli, ["install", "host1", "--user", "ubuntu", "--token", "tok"])
@@ -310,6 +316,12 @@ class TestCLI:
@patch("gitea_runner_manager.cli.RunnerManager")
def test_disable_missing_url(self, mock_manager_class: MagicMock) -> None:
mock_manager = MagicMock()
from gitea_runner_manager.exceptions import AnsibleError
mock_manager.disable.side_effect = AnsibleError("GITEA_URL must be set (or pass --url)")
mock_manager_class.return_value = mock_manager
with patch.dict("os.environ", {"GITEA_REGISTRATION_TOKEN": "tok"}, clear=True):
runner = CliRunner()
result = runner.invoke(cli, ["disable", "r1", "--token", "tok"])
@@ -419,6 +431,12 @@ class TestCLI:
@patch("gitea_runner_manager.cli.RunnerManager")
def test_remove_missing_url(self, mock_manager_class: MagicMock) -> None:
mock_manager = MagicMock()
from gitea_runner_manager.exceptions import AnsibleError
mock_manager.remove.side_effect = AnsibleError("GITEA_URL must be set (or pass --url)")
mock_manager_class.return_value = mock_manager
with patch.dict("os.environ", {"GITEA_REGISTRATION_TOKEN": "tok"}, clear=True):
runner = CliRunner()
result = runner.invoke(cli, ["remove", "r1", "--token", "tok"])
+23 -4
View File
@@ -96,6 +96,11 @@ class TestRunnerManager:
name="host1", host="host1", user="root", key=None, mode="binary", gitea_url="https://git.example.com"
)
def test_install_missing_gitea_url(self) -> None:
manager = RunnerManager()
with pytest.raises(AnsibleError, match="GITEA_URL must be set"):
manager.install("host", "user", token="tok")
def test_install_missing_token(self) -> None:
manager = RunnerManager()
with pytest.raises(AnsibleError, match="GITEA_REGISTRATION_TOKEN must be set"):
@@ -105,7 +110,7 @@ class TestRunnerManager:
manager = RunnerManager()
with patch.object(Path, "exists", return_value=False):
with pytest.raises(AnsibleError, match="Playbook not found"):
manager.install("host", "user", token="tok")
manager.install("host", "user", token="tok", gitea_url="https://git.example.com")
def test_install_with_admin_token(self) -> None:
mock_registry = MagicMock()
@@ -125,7 +130,7 @@ class TestRunnerManager:
manager._executor = mock_executor
mock_executor.run.side_effect = AnsibleError("Ansible failed with exit code 1. See full log: /tmp/test.log")
with pytest.raises(AnsibleError, match="Ansible failed with exit code 1"):
manager.install("host", "user", token="tok")
manager.install("host", "user", token="tok", gitea_url="https://git.example.com")
mock_registry.add.assert_not_called()
def test_update(self) -> None:
@@ -308,7 +313,14 @@ class TestRunnerManager:
mock_registry.get.return_value = {"host": "host", "user": "user"}
manager = RunnerManager(registry=mock_registry)
with pytest.raises(AnsibleError, match="GITEA_REGISTRATION_TOKEN must be set"):
manager.disable("r1")
manager.disable("r1", gitea_url="https://git.example.com")
def test_disable_missing_gitea_url(self) -> None:
mock_registry = MagicMock()
mock_registry.get.return_value = {"host": "host", "user": "user"}
manager = RunnerManager(registry=mock_registry)
with pytest.raises(AnsibleError, match="GITEA_URL must be set"):
manager.disable("r1", token="tok")
def test_status(self) -> None:
mock_registry = MagicMock()
@@ -348,7 +360,14 @@ class TestRunnerManager:
mock_registry.get.return_value = {"host": "host", "user": "user"}
manager = RunnerManager(registry=mock_registry)
with pytest.raises(AnsibleError, match="GITEA_REGISTRATION_TOKEN must be set"):
manager.remove("r1")
manager.remove("r1", gitea_url="https://git.example.com")
def test_remove_missing_gitea_url(self) -> None:
mock_registry = MagicMock()
mock_registry.get.return_value = {"host": "host", "user": "user"}
manager = RunnerManager(registry=mock_registry)
with pytest.raises(AnsibleError, match="GITEA_URL must be set"):
manager.remove("r1", token="tok")
def test_remove_registry_deleted_on_failure(self) -> None:
mock_registry = MagicMock()