oblachno-oss/grm
3
0
Fork 0
Code Issues 31 Pull Requests Actions Packages Projects Releases 19 Wiki Activity

GRM-156: fix: switch default network driver to slirp4netns (pasta TCP RST bug)

Browse Source 
Co-authored-by: oblachno Admin <admin@oblachno.oblachno.fyi>
This commit is contained in:
gitea-admin
2026-08-09 01:06:52 +02:00
committed by Emil Simeonov
parent db9fb6f162
commit 41c661e6c8
12 changed files with 390 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/test_cli.py
+122
View File
@@ -50,9 +50,11 @@ class TestCLI:
admin_token="",
integration_retries=3,
labels=None,
force_reregister=False,
ask_become_pass=True,
become_password_file=None,
verbose=False,
auto_recover_token=None,
)
@patch("grm.cli.RunnerManager")
@@ -73,9 +75,11 @@ class TestCLI:
admin_token="",
integration_retries=3,
labels=None,
force_reregister=False,
ask_become_pass=False,
become_password_file=None,
verbose=False,
auto_recover_token=None,
)
@patch("grm.cli.RunnerManager")
@@ -114,9 +118,11 @@ class TestCLI:
admin_token=None,
integration_retries=3,
labels=None,
force_reregister=False,
ask_become_pass=True,
become_password_file=None,
verbose=False,
auto_recover_token=None,
)
@patch("grm.cli.RunnerManager")
@@ -165,9 +171,11 @@ class TestCLI:
admin_token="",
integration_retries=3,
labels=None,
force_reregister=False,
ask_become_pass=True,
become_password_file=None,
verbose=False,
auto_recover_token=None,
)
@patch("grm.cli.RunnerManager")
@@ -188,9 +196,11 @@ class TestCLI:
admin_token="",
integration_retries=3,
labels=None,
force_reregister=False,
ask_become_pass=True,
become_password_file=None,
verbose=False,
auto_recover_token=None,
)
@patch("grm.cli.RunnerManager")
@@ -226,9 +236,92 @@ class TestCLI:
admin_token="",
integration_retries=3,
labels="docker:docker://alpine:latest",
force_reregister=False,
ask_become_pass=True,
become_password_file=None,
verbose=False,
auto_recover_token=None,
)
@patch("grm.cli.RunnerManager")
def test_install_force_reregister(self, mock_manager_class: MagicMock) -> None:
mock_manager = MagicMock()
mock_manager_class.return_value = mock_manager
runner = CliRunner(env=_TEST_ENV)
result = runner.invoke(cli, ["install", "host1", "--user", "ubuntu", "--token", "tok", "--force-reregister"])
assert result.exit_code == 0
mock_manager.install.assert_called_once_with(
host="host1",
user="ubuntu",
key=None,
name=None,
token="tok",
gitea_url="https://git.example.com",
admin_token="",
integration_retries=3,
labels=None,
force_reregister=True,
ask_become_pass=True,
become_password_file=None,
verbose=False,
auto_recover_token=None,
)
@patch("grm.cli.RunnerManager")
def test_install_with_auto_recover_token(self, mock_manager_class: MagicMock) -> None:
"""--auto-recover-token passes the token to the manager for healthcheck auto-recovery."""
mock_manager = MagicMock()
mock_manager_class.return_value = mock_manager
runner = CliRunner(env=_TEST_ENV)
result = runner.invoke(
cli,
["install", "host1", "--user", "ubuntu", "--token", "tok", "--auto-recover-token", "api-tok"],
)
assert result.exit_code == 0
mock_manager.install.assert_called_once_with(
host="host1",
user="ubuntu",
key=None,
name=None,
token="tok",
gitea_url="https://git.example.com",
admin_token="",
integration_retries=3,
labels=None,
force_reregister=False,
ask_become_pass=True,
become_password_file=None,
verbose=False,
auto_recover_token="api-tok",
)
@patch("grm.cli.RunnerManager")
def test_install_auto_recover_token_from_env(self, mock_manager_class: MagicMock) -> None:
"""GITEA_AUTO_RECOVER_TOKEN env var is used when --auto-recover-token is not passed."""
mock_manager = MagicMock()
mock_manager_class.return_value = mock_manager
env = {**_TEST_ENV, "GITEA_AUTO_RECOVER_TOKEN": "env-tok"}
runner = CliRunner(env=env)
result = runner.invoke(cli, ["install", "host1", "--user", "ubuntu", "--token", "tok"])
assert result.exit_code == 0
mock_manager.install.assert_called_once_with(
host="host1",
user="ubuntu",
key=None,
name=None,
token="tok",
gitea_url="https://git.example.com",
admin_token="",
integration_retries=3,
labels=None,
force_reregister=False,
ask_become_pass=True,
become_password_file=None,
verbose=False,
auto_recover_token="env-tok",
)
@patch("grm.cli.RunnerManager")
@@ -250,9 +343,11 @@ class TestCLI:
admin_token="",
integration_retries=3,
labels="",
force_reregister=False,
ask_become_pass=True,
become_password_file=None,
verbose=False,
auto_recover_token=None,
)
@patch("grm.cli.RunnerManager")
@@ -274,9 +369,11 @@ class TestCLI:
admin_token="",
integration_retries=3,
labels="docker:docker://alpine:latest",
force_reregister=False,
ask_become_pass=True,
become_password_file=None,
verbose=False,
auto_recover_token=None,
)
@patch("grm.cli.RunnerManager")
@@ -307,9 +404,11 @@ class TestCLI:
admin_token="",
integration_retries=3,
labels=None,
force_reregister=False,
ask_become_pass=True,
become_password_file=pw_file,
verbose=False,
auto_recover_token=None,
)
finally:
import os
@@ -334,9 +433,11 @@ class TestCLI:
admin_token="",
integration_retries=3,
labels=None,
force_reregister=False,
ask_become_pass=True,
become_password_file=None,
verbose=True,
auto_recover_token=None,
)
@patch("grm.cli.RunnerManager")
@@ -741,6 +842,27 @@ class TestCLI:
assert "active" in result.output
mock_manager.list_runners.assert_called_once_with(become_pass=None, no_status=False)
@patch("grm.cli.RunnerManager")
def test_list_with_none_labels(self, mock_manager_class: MagicMock) -> None:
"""Runners with labels=None should not crash the list command."""
mock_manager = MagicMock()
mock_manager.list_runners.return_value = [
{
"name": "r1",
"host": "10.0.0.1",
"user": "ubuntu",
"labels": None,
"status": "active",
},
]
mock_manager_class.return_value = mock_manager
runner = CliRunner()
result = runner.invoke(cli, ["list"])
assert result.exit_code == 0
assert "r1" in result.output
assert "active" in result.output
@patch("grm.cli.RunnerManager")
def test_list_no_status(self, mock_manager_class: MagicMock) -> None:
"""--no-status skips SSH checks and shows registry only."""
tests/unit/test_runner_manager.py
+48
View File
@@ -51,6 +51,7 @@ class TestRunnerManager:
assert manager._captured_extra_vars["registration_token"] == "tok"
assert manager._captured_extra_vars["gitea_runner_name"] == "192.168.1.10"
assert manager._captured_extra_vars["gitea_url"] == "https://git.example.com"
assert manager._captured_extra_vars["gitea_runner_force_reregister"] is False
assert "Installing Gitea Runner on 192.168.1.10" in mock_executor.run.call_args.kwargs["description"]
mock_registry.add.assert_called_once_with(
name="192.168.1.10",
@@ -76,6 +77,7 @@ class TestRunnerManager:
assert "/key" in cmd_str
assert manager._captured_extra_vars["registration_token"] == "preset"
assert manager._captured_extra_vars["gitea_runner_name"] == "my-runner"
assert manager._captured_extra_vars["gitea_runner_force_reregister"] is False
assert "--ask-become-pass" not in cmd_str
mock_registry.add.assert_called_once_with(
name="my-runner",
@@ -97,6 +99,52 @@ class TestRunnerManager:
cmd_str = " ".join(cmd)
assert "--ask-become-pass" in cmd_str
def test_install_force_reregister(self) -> None:
mock_registry = MagicMock()
manager = RunnerManager(registry=mock_registry)
mock_executor = MagicMock()
manager._executor = mock_executor
manager.install(
"host1",
"root",
token="tok",
gitea_url="https://git.example.com",
force_reregister=True,
)
assert manager._captured_extra_vars["gitea_runner_force_reregister"] is True
def test_install_with_auto_recover_token(self) -> None:
"""auto_recover_token is passed as extra_var to Ansible."""
mock_registry = MagicMock()
manager = RunnerManager(registry=mock_registry)
mock_executor = MagicMock()
manager._executor = mock_executor
manager.install(
"host1",
"root",
token="tok",
gitea_url="https://git.example.com",
auto_recover_token="api-tok",
)
assert manager._captured_extra_vars["gitea_runner_auto_recover_api_token"] == "api-tok"
def test_install_without_auto_recover_token(self) -> None:
"""When auto_recover_token is None, the extra_var is not set."""
mock_registry = MagicMock()
manager = RunnerManager(registry=mock_registry)
mock_executor = MagicMock()
manager._executor = mock_executor
manager.install(
"host1",
"root",
token="tok",
gitea_url="https://git.example.com",
)
assert "gitea_runner_auto_recover_api_token" not in manager._captured_extra_vars
def test_install_missing_gitea_url(self) -> None:
manager = RunnerManager()
with pytest.raises(AnsibleError, match="GITEA_URL must be set"):