GRM-107: refactor: use devx Makefile aliases, bump devx>=0.23.0

tests/unit/test_cli.py

@@ -286,6 +286,22 @@ class TestCLI:
             ask_become_pass=True,
         )
 
+    @patch("gitea_runner_manager.cli.RunnerManager")
+    def test_restart(self, mock_manager_class: MagicMock) -> None:
+        mock_manager = MagicMock()
+        mock_manager_class.return_value = mock_manager
+
+        runner = CliRunner()
+        result = runner.invoke(cli, ["restart", "r1"])
+        assert result.exit_code == 0
+        mock_manager.restart.assert_called_once_with(
+            name="r1",
+            host=None,
+            user=None,
+            key=None,
+            ask_become_pass=True,
+        )
+
     @patch("gitea_runner_manager.cli.RunnerManager")
     def test_enable(self, mock_manager_class: MagicMock) -> None:
         mock_manager = MagicMock()
@@ -539,7 +555,33 @@ class TestCLI:
         assert "r1" in result.output
         assert "10.0.0.1" in result.output
         assert "active" in result.output
-        mock_manager.list_runners.assert_called_once()
+        mock_manager.list_runners.assert_called_once_with(become_pass=None)
+
+    @patch("gitea_runner_manager.cli.click.prompt", return_value="secret")
+    @patch("gitea_runner_manager.cli.sys.stdin")
+    def test_collect_become_pass_tty(self, mock_stdin: MagicMock, mock_prompt: MagicMock) -> None:
+        from gitea_runner_manager.cli import _collect_become_pass
+
+        mock_stdin.isatty.return_value = True
+        assert _collect_become_pass(ask_become_pass=True) == "secret"
+
+    @patch("gitea_runner_manager.cli.sys.stdin")
+    def test_collect_become_pass_no_ask(self, mock_stdin: MagicMock) -> None:
+        from gitea_runner_manager.cli import _collect_become_pass
+
+        mock_stdin.isatty.return_value = True
+        assert _collect_become_pass(ask_become_pass=False) is None
+
+    @patch("gitea_runner_manager.cli.RunnerManager")
+    def test_list_with_piped_become_pass(self, mock_manager_class: MagicMock) -> None:
+        mock_manager = MagicMock()
+        mock_manager.list_runners.return_value = []
+        mock_manager_class.return_value = mock_manager
+
+        runner = CliRunner()
+        result = runner.invoke(cli, ["list"], input="secret\n")
+        assert result.exit_code == 0
+        mock_manager.list_runners.assert_called_once_with(become_pass="secret")
 
     @patch("gitea_runner_manager.cli.RunnerManager")
     def test_list_empty(self, mock_manager_class: MagicMock) -> None:

tests/unit/test_executor.py

@@ -212,17 +212,14 @@ class TestAnsibleExecutorAdHoc:
         result_mock.stderr = ""
 
         with patch("subprocess.run", return_value=result_mock) as mock_run:
-            with patch("sys.stdin.isatty", return_value=True):
-                result = executor.run_ad_hoc(
-                    "10.0.0.1", "ubuntu", None, "shell", "cmd", become=True, ask_become_pass=True
-                )
+            result = executor.run_ad_hoc("10.0.0.1", "ubuntu", None, "shell", "cmd", become=True, ask_become_pass=True)
 
         assert result == "ok"
         cmd = mock_run.call_args.args[0]
         assert "--become" in cmd
         assert "--ask-become-pass" in cmd
 
-    def test_run_ad_hoc_ask_become_pass_no_tty(self, tmp_path: Path) -> None:
+    def test_run_ad_hoc_with_become_pass(self, tmp_path: Path) -> None:
         executor = AnsibleExecutor(log_dir=tmp_path)
         result_mock = MagicMock()
         result_mock.stdout = "ok\n"
@@ -230,14 +227,37 @@ class TestAnsibleExecutorAdHoc:
         result_mock.stderr = ""
 
         with patch("subprocess.run", return_value=result_mock) as mock_run:
-            with patch("sys.stdin.isatty", return_value=False):
+            with patch("os.unlink"):
                 result = executor.run_ad_hoc(
-                    "10.0.0.1", "ubuntu", None, "shell", "cmd", become=True, ask_become_pass=True
+                    "10.0.0.1",
+                    "ubuntu",
+                    None,
+                    "shell",
+                    "cmd",
+                    become=True,
+                    ask_become_pass=True,
+                    become_pass="secret",
                 )
 
         assert result == "ok"
         cmd = mock_run.call_args.args[0]
         assert "--become" in cmd
+        assert "--become-password-file" in cmd
+        assert "--ask-become-pass" not in cmd
+
+    def test_run_ad_hoc_ask_become_pass_no_become(self, tmp_path: Path) -> None:
+        executor = AnsibleExecutor(log_dir=tmp_path)
+        result_mock = MagicMock()
+        result_mock.stdout = "ok\n"
+        result_mock.returncode = 0
+        result_mock.stderr = ""
+
+        with patch("subprocess.run", return_value=result_mock) as mock_run:
+            result = executor.run_ad_hoc("10.0.0.1", "ubuntu", None, "shell", "cmd", become=False, ask_become_pass=True)
+
+        assert result == "ok"
+        cmd = mock_run.call_args.args[0]
+        assert "--become" not in cmd
         assert "--ask-become-pass" not in cmd
 
     def test_run_ad_hoc_check_false(self, tmp_path: Path) -> None:

tests/unit/test_runner_manager.py

@@ -297,6 +297,20 @@ class TestRunnerManager:
         assert manager._captured_extra_vars["runner_name"] == "r1"
         assert "Stopping Gitea Runner r1 on host" in mock_executor.run.call_args.kwargs["description"]
 
+    def test_restart(self) -> None:
+        mock_registry = MagicMock()
+        mock_registry.get.return_value = {"host": "host", "user": "user", "key": None}
+        manager = RunnerManager(registry=mock_registry)
+        mock_executor = MagicMock()
+        manager._executor = mock_executor
+
+        manager.restart("r1")
+        cmd = mock_executor.run.call_args.args[0]
+        cmd_str = " ".join(cmd)
+        assert "restart-runner.yml" in cmd_str
+        assert manager._captured_extra_vars["runner_name"] == "r1"
+        assert "Restarting Gitea Runner r1 on host" in mock_executor.run.call_args.kwargs["description"]
+
     def test_enable(self) -> None:
         mock_registry = MagicMock()
         mock_registry.get.return_value = {"host": "host", "user": "user", "key": None}
@@ -471,10 +485,13 @@ class TestRunnerManager:
             "ubuntu",
             "/key",
             "shell",
-            "sudo -u grm-r1 systemctl --user is-active gitea-runner 2>/dev/null",
+            "sudo -u grm-r1 "
+            "XDG_RUNTIME_DIR=/run/user/$(id -u grm-r1) "
+            "systemctl --user is-active gitea-runner 2>/dev/null",
             become=True,
             ask_become_pass=True,
             check=False,
+            become_pass=None,
         )
 
     def test_list_runners_exception(self) -> None: