GRM-156: fix: switch default network driver to slirp4netns (pasta TCP RST bug)
Co-authored-by: oblachno Admin <admin@oblachno.oblachno.fyi>
This commit is contained in:
@@ -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."""
|
||||
|
||||
Reference in New Issue
Block a user