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>
177 lines
5.4 KiB
Python
177 lines
5.4 KiB
Python
import unittest
|
|
from unittest.mock import patch
|
|
|
|
from plugins.action.uri_retry import ActionModule
|
|
|
|
|
|
class _FakeTask:
|
|
def __init__(
|
|
self,
|
|
*,
|
|
args=None,
|
|
ds=None,
|
|
async_val=0,
|
|
retries=None,
|
|
delay=0,
|
|
):
|
|
self.args = {} if args is None else dict(args)
|
|
self._ds = {} if ds is None else dict(ds)
|
|
self.async_val = async_val
|
|
self.retries = retries
|
|
self.delay = delay
|
|
|
|
def get_ds(self):
|
|
return self._ds
|
|
|
|
|
|
def _make_action(task: _FakeTask) -> ActionModule:
|
|
action = object.__new__(ActionModule)
|
|
action._task = task
|
|
return action
|
|
|
|
|
|
class TestUriRetryActionPlugin(unittest.TestCase):
|
|
def test_run_uses_default_retry_policy(self):
|
|
task = _FakeTask(args={"url": "http://example.invalid"})
|
|
action = _make_action(task)
|
|
|
|
with (
|
|
patch(
|
|
"plugins.action.uri_retry.UriActionModule.run",
|
|
autospec=True,
|
|
side_effect=[
|
|
{"failed": True, "msg": "temporary"},
|
|
{"failed": False, "status": 200},
|
|
],
|
|
) as run_mock,
|
|
patch("plugins.action.uri_retry.time.sleep") as sleep_mock,
|
|
):
|
|
result = action.run(task_vars={})
|
|
|
|
self.assertEqual(result.get("status"), 200)
|
|
self.assertEqual(result.get("attempts"), 2)
|
|
self.assertEqual(run_mock.call_count, 2)
|
|
sleep_mock.assert_called_once_with(2)
|
|
|
|
def test_run_honors_standard_retries_and_delay_keywords(self):
|
|
task = _FakeTask(
|
|
args={"url": "http://example.invalid"},
|
|
ds={"retries": 2, "delay": 1},
|
|
retries=2,
|
|
delay=1,
|
|
)
|
|
action = _make_action(task)
|
|
|
|
with (
|
|
patch(
|
|
"plugins.action.uri_retry.UriActionModule.run",
|
|
autospec=True,
|
|
side_effect=[
|
|
{"failed": True, "msg": "attempt-1"},
|
|
{"failed": True, "msg": "attempt-2"},
|
|
{"failed": False, "status": 200},
|
|
],
|
|
) as run_mock,
|
|
patch("plugins.action.uri_retry.time.sleep") as sleep_mock,
|
|
):
|
|
result = action.run(task_vars={})
|
|
|
|
self.assertEqual(result.get("status"), 200)
|
|
self.assertEqual(result.get("attempts"), 3)
|
|
self.assertEqual(run_mock.call_count, 3)
|
|
self.assertEqual(sleep_mock.call_count, 2)
|
|
sleep_mock.assert_called_with(1)
|
|
|
|
def test_run_delegates_to_native_when_until_is_set(self):
|
|
task = _FakeTask(
|
|
args={"url": "http://example.invalid"},
|
|
ds={"until": "uri_result.status == 200"},
|
|
)
|
|
action = _make_action(task)
|
|
|
|
with (
|
|
patch(
|
|
"plugins.action.uri_retry.UriActionModule.run",
|
|
autospec=True,
|
|
return_value={"failed": True, "msg": "native-until"},
|
|
) as run_mock,
|
|
patch("plugins.action.uri_retry.time.sleep") as sleep_mock,
|
|
):
|
|
result = action.run(task_vars={})
|
|
|
|
self.assertTrue(result.get("failed"))
|
|
self.assertEqual(run_mock.call_count, 1)
|
|
sleep_mock.assert_not_called()
|
|
|
|
def test_run_does_not_retry_for_async_tasks(self):
|
|
task = _FakeTask(
|
|
args={"url": "http://example.invalid"},
|
|
async_val=30,
|
|
)
|
|
action = _make_action(task)
|
|
|
|
with patch(
|
|
"plugins.action.uri_retry.UriActionModule.run",
|
|
autospec=True,
|
|
return_value={"failed": True, "msg": "async path"},
|
|
) as run_mock:
|
|
result = action.run(task_vars={})
|
|
|
|
self.assertTrue(result.get("failed"))
|
|
self.assertEqual(run_mock.call_count, 1)
|
|
|
|
def test_failed_result_contains_attempts_after_exhausting_retries(self):
|
|
task = _FakeTask(
|
|
args={"url": "http://example.invalid"},
|
|
ds={"retries": 1, "delay": 1},
|
|
retries=1,
|
|
delay=1,
|
|
)
|
|
action = _make_action(task)
|
|
|
|
with (
|
|
patch(
|
|
"plugins.action.uri_retry.UriActionModule.run",
|
|
autospec=True,
|
|
side_effect=[
|
|
{"failed": True, "msg": "attempt-1"},
|
|
{"failed": True, "msg": "attempt-2"},
|
|
],
|
|
) as run_mock,
|
|
patch("plugins.action.uri_retry.time.sleep") as sleep_mock,
|
|
):
|
|
result = action.run(task_vars={})
|
|
|
|
self.assertTrue(result.get("failed"))
|
|
self.assertEqual(result.get("attempts"), 2)
|
|
self.assertEqual(run_mock.call_count, 2)
|
|
sleep_mock.assert_called_once_with(1)
|
|
|
|
def test_attempts_is_overwritten_with_real_retry_count(self):
|
|
task = _FakeTask(
|
|
args={"url": "http://example.invalid"},
|
|
ds={"retries": 2, "delay": 1},
|
|
retries=2,
|
|
delay=1,
|
|
)
|
|
action = _make_action(task)
|
|
|
|
with (
|
|
patch(
|
|
"plugins.action.uri_retry.UriActionModule.run",
|
|
autospec=True,
|
|
side_effect=[
|
|
{"failed": True, "msg": "attempt-1", "attempts": 1},
|
|
{"failed": False, "status": 200, "attempts": 1},
|
|
],
|
|
),
|
|
patch("plugins.action.uri_retry.time.sleep"),
|
|
):
|
|
result = action.run(task_vars={})
|
|
|
|
self.assertEqual(result.get("attempts"), 2)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|