mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 19:01:54 +00:00
Every script a role ships now lives under `files/<language>/`, and the unit
suite is split the same way: `tests/unit/python/` beside new sibling trees for
the other languages. `tests/lint/filesystem/test_role_files_layout.py` keeps it
that way; directories whose shape is dictated from outside carry a `.nocheck`
naming the constraint (Docker build contexts, WordPress mu-plugins, the Joomla
extension, Odoo addons, Playwright suites, the `files/test/test.sh` harness
that `test-e2e-cli` resolves generically).
This cannot be applied in halves. Moving a file and repointing what names it
are the same change: 14 references resolve only at deploy time, so the tree is
green either before or after, never between.
Those 14 were found by static resolution over every reference class, not by the
test suite -- a full `make quality-high` was green while all of them were
broken:
* 7 `src:` values built from a role variable holding a bare filename
(svc-bkp-remote-2-local, decidim, espocrm, friendica, joomla, pixelfed x2).
The variable doubles as the destination name inside the container, so the
language segment belongs at the call site, not in the variable.
* `sys-service/tasks/04_base.yml` resolved every consumer's systemd script
through `first_found(..., errors='strict')` over `files/script.{sh,py}`.
18 roles ship exactly that and have no template fallback: the play would
have died on each.
* `sys-front-inj-javascript` fell back to `<role>/files/javascript.js`; the
interface now reads `files/javascript/javascript.js`.
* `sys-front-inj-logout/templates/head_sub.j2` built the cache-busting mtime
path through `path_absolute(... 'files', ...)`.
* 4 `ansible.builtin.script:` invocations naming a bare command
(pull.py, prune.sh, set_postgres_superuser_password.sh, ganesha-serve.sh).
* `dev-python/files/shell/install.sh` pointed at a sibling role's script.
Depth-dependent paths inside the moved trees were bumped accordingly: 59
`parents[N]` computations, 12 relative climbs, and the per-role recover CLI,
whose path `cli/administration/recover/recoverers.py` still assembled from the
pre-move location.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
195 lines
5.8 KiB
Python
195 lines
5.8 KiB
Python
from __future__ import annotations
|
|
|
|
import unittest
|
|
|
|
from cli.administration.deploy.runner.command import (
|
|
DEFAULT_OUTPUT,
|
|
DEFAULT_RUNNER_COUNT,
|
|
RUNNER_ROLE,
|
|
_normalize_roles,
|
|
_prepend_runner_role,
|
|
build_parser,
|
|
)
|
|
|
|
|
|
class TestRunnerBuildParser(unittest.TestCase):
|
|
def test_required_args_present(self):
|
|
parser = build_parser()
|
|
opts = {a.dest for a in parser._actions}
|
|
self.assertIn("hostname", opts)
|
|
self.assertIn("roles", opts)
|
|
self.assertIn("distribution", opts)
|
|
self.assertIn("port", opts)
|
|
self.assertIn("output", opts)
|
|
self.assertIn("runner_count", opts)
|
|
|
|
def test_output_default_value(self):
|
|
args = build_parser().parse_args(
|
|
["myhost", "--roles", "svc-runner", "--distribution", "debian"]
|
|
)
|
|
self.assertEqual(args.output, DEFAULT_OUTPUT)
|
|
|
|
def test_port_defaults_to_none(self):
|
|
args = build_parser().parse_args(
|
|
["myhost", "--roles", "svc-runner", "--distribution", "debian"]
|
|
)
|
|
self.assertIsNone(args.port)
|
|
|
|
def test_port_accepted(self):
|
|
args = build_parser().parse_args(
|
|
[
|
|
"myhost",
|
|
"--port",
|
|
"2222",
|
|
"--roles",
|
|
"svc-runner",
|
|
"--distribution",
|
|
"debian",
|
|
]
|
|
)
|
|
self.assertEqual(args.port, 2222)
|
|
|
|
def test_hostname_positional(self):
|
|
args = build_parser().parse_args(
|
|
[
|
|
"runner.example.com",
|
|
"--roles",
|
|
"svc-runner",
|
|
"--distribution",
|
|
"archlinux",
|
|
]
|
|
)
|
|
self.assertEqual(args.hostname, "runner.example.com")
|
|
|
|
def test_roles_required(self):
|
|
with self.assertRaises(SystemExit):
|
|
build_parser().parse_args(["myhost", "--distribution", "debian"])
|
|
|
|
def test_distribution_required(self):
|
|
with self.assertRaises(SystemExit):
|
|
build_parser().parse_args(["myhost", "--roles", "svc-runner"])
|
|
|
|
def test_hostname_required(self):
|
|
with self.assertRaises(SystemExit):
|
|
build_parser().parse_args(
|
|
["--roles", "svc-runner", "--distribution", "debian"]
|
|
)
|
|
|
|
def test_custom_output_accepted(self):
|
|
args = build_parser().parse_args(
|
|
[
|
|
"myhost",
|
|
"--roles",
|
|
"svc-runner",
|
|
"--distribution",
|
|
"debian",
|
|
"--output",
|
|
"/tmp/my-runner.log",
|
|
]
|
|
)
|
|
self.assertEqual(args.output, "/tmp/my-runner.log")
|
|
|
|
def test_multiple_roles_accepted(self):
|
|
args = build_parser().parse_args(
|
|
["myhost", "--roles", "svc-runner", "keycloak", "--distribution", "debian"]
|
|
)
|
|
self.assertEqual(args.roles, ["svc-runner", "keycloak"])
|
|
|
|
def test_runner_count_default(self):
|
|
args = build_parser().parse_args(
|
|
["myhost", "--roles", "svc-runner", "--distribution", "debian"]
|
|
)
|
|
self.assertEqual(args.runner_count, DEFAULT_RUNNER_COUNT)
|
|
self.assertIsNone(DEFAULT_RUNNER_COUNT)
|
|
|
|
def test_runner_count_accepted(self):
|
|
args = build_parser().parse_args(
|
|
[
|
|
"myhost",
|
|
"--roles",
|
|
"svc-runner",
|
|
"--distribution",
|
|
"debian",
|
|
"--runner-count",
|
|
"5",
|
|
]
|
|
)
|
|
self.assertEqual(args.runner_count, 5)
|
|
|
|
|
|
class TestNormalizeRoles(unittest.TestCase):
|
|
def test_empty(self):
|
|
self.assertEqual(_normalize_roles([]), [])
|
|
|
|
def test_single(self):
|
|
self.assertEqual(_normalize_roles(["svc-runner"]), ["svc-runner"])
|
|
|
|
def test_comma_separated(self):
|
|
self.assertEqual(
|
|
_normalize_roles(["svc-runner,keycloak,postgres"]),
|
|
["svc-runner", "keycloak", "postgres"],
|
|
)
|
|
|
|
def test_space_separated(self):
|
|
self.assertEqual(
|
|
_normalize_roles(["svc-runner", "keycloak", "postgres"]),
|
|
["svc-runner", "keycloak", "postgres"],
|
|
)
|
|
|
|
def test_mixed_space_and_comma(self):
|
|
self.assertEqual(
|
|
_normalize_roles(["svc-runner,keycloak", "postgres"]),
|
|
["svc-runner", "keycloak", "postgres"],
|
|
)
|
|
|
|
def test_deduplication_preserves_order(self):
|
|
self.assertEqual(
|
|
_normalize_roles(["keycloak", "keycloak", "postgres"]),
|
|
["keycloak", "postgres"],
|
|
)
|
|
|
|
def test_trimming_whitespace(self):
|
|
self.assertEqual(
|
|
_normalize_roles([" keycloak , postgres "]),
|
|
["keycloak", "postgres"],
|
|
)
|
|
|
|
def test_empty_entries_skipped(self):
|
|
self.assertEqual(
|
|
_normalize_roles(["keycloak,,postgres", ",svc-runner,"]),
|
|
["keycloak", "postgres", "svc-runner"],
|
|
)
|
|
|
|
|
|
class TestPrependRunnerRole(unittest.TestCase):
|
|
def test_prepends_when_absent(self):
|
|
self.assertEqual(
|
|
_prepend_runner_role(["keycloak", "postgres"]),
|
|
[RUNNER_ROLE, "keycloak", "postgres"],
|
|
)
|
|
|
|
def test_no_duplicate_when_already_first(self):
|
|
self.assertEqual(
|
|
_prepend_runner_role([RUNNER_ROLE, "keycloak"]),
|
|
[RUNNER_ROLE, "keycloak"],
|
|
)
|
|
|
|
def test_moves_to_front_when_not_first(self):
|
|
self.assertEqual(
|
|
_prepend_runner_role(["keycloak", RUNNER_ROLE, "postgres"]),
|
|
[RUNNER_ROLE, "keycloak", "postgres"],
|
|
)
|
|
|
|
def test_empty_list_gets_runner_role(self):
|
|
self.assertEqual(
|
|
_prepend_runner_role([]),
|
|
[RUNNER_ROLE],
|
|
)
|
|
|
|
def test_runner_role_constant_value(self):
|
|
self.assertEqual(RUNNER_ROLE, "svc-runner")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|