mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-11 21:54:00 +01:00
Krzysztof kuhy Rudnicki
4f2b0ccdf7
Two levels of pure taxonomy carrying no information, and a 2-directory
cap leaves no room for them. Categories now sit directly under
linux_configuration/: features, fixes, utils, misc, fresh-install,
installers, diagnostics, gaming, boot_recovery, periodic_background, lib,
meta, tests. A script's own lib/ and tests/ are exempt from the cap, so
those stay put.
Depth violations 248 -> 139; roughly 40 of the remainder are inside
digital_wellbeing and hosts, deferred until the guard-lib repoint.
The moves are the easy half. What breaks is every path that counted
levels, and three classes of it had to be found by resolving paths rather
than reading diffs:
- 52 relative `source` lines for lib/common.sh and lib/android.sh. The
correct prefix differs per file: 40 were ../../ and 12 were ../../../,
so a blanket replace would have fixed one set and broken the other.
- REPO_ROOT in 7 fixes/lib/tests harnesses and setup_syncyomi_guard.sh,
each walking up four levels from a directory now two levels shallower.
This caused a real regression -- the fixes suite went red with
"log_warn: command not found" -- caught by running it and comparing
against the pre-move baseline worktree.
- conftest.py's sys.path entries, which took the pytest gate down with
14 collection errors, and the `# shellcheck source=` directives, which
took shellcheck down with SC1091.
16 symlinks in $HOME broke, including the entire i3blocks bar. All
repointed, and cpu_monitor/memory/disk/time/volume were run to confirm
they emit real output rather than merely resolving.
Verified: 1798 tests pass at 100% coverage, 8 of 9 lib/tests suites pass
(the ninth needs the coverage jail, identically at baseline), pre-commit
is clean, and the two untracked secret configs are still ignored after
their gitignore paths changed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
144 lines
6.2 KiB
Bash
Executable File
144 lines
6.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Tests for lib/services_apps.sh — the messaging-app launch wrappers and the
|
|
# LeechBlock browser extension check.
|
|
#
|
|
# check_compulsive_blocker has a three-way branch per app: a wrapper is
|
|
# installed (.orig backup present), the app is installed but unwrapped, or the
|
|
# app is absent entirely. `command -v` decides the second vs third case, so the
|
|
# tests create and remove fake executables on PATH via present_command /
|
|
# absent_command rather than shimming `command`, which is a bash builtin.
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
|
|
# shellcheck source=services_harness.sh
|
|
. "${SCRIPT_DIR}/services_harness.sh"
|
|
# shellcheck source=../services_apps.sh
|
|
. "${SCRIPT_DIR}/../services_apps.sh"
|
|
|
|
_t_called_in() { # <haystack> <needle> <what>
|
|
if [[ "$1" == *"$2"* ]]; then
|
|
_t_pass "$3"
|
|
else
|
|
_t_fail "$3 (missing '$2')"
|
|
fi
|
|
}
|
|
|
|
TEST_USER="${SUDO_USER:-$USER}"
|
|
|
|
echo "== check_compulsive_blocker: no target apps present =="
|
|
reset_state
|
|
absent_command beeper signal-desktop discord
|
|
sysfile usr/local/bin/block-compulsive-opening.sh
|
|
check_compulsive_blocker >"${TEST_TMPDIR}/out.txt"
|
|
_t_called_in "$(cat "${TEST_TMPDIR}/out.txt")" "No target apps" "an absent app set is reported as not applicable"
|
|
_t_eq "ok" "$(get_service_status "compulsive_blocker")" "with the blocker installed and no apps, status is ok"
|
|
|
|
echo "== check_compulsive_blocker: blocker script missing is an error =="
|
|
reset_state
|
|
absent_command beeper signal-desktop discord
|
|
make_installer "$COMPULSIVE_BLOCK_SCRIPT"
|
|
check_compulsive_blocker >/dev/null
|
|
_t_called 'ran block_compulsive_opening.sh install' "a missing blocker script runs the installer with 'install'"
|
|
_t_eq "1" "$FIXES_APPLIED" "the fix is counted"
|
|
|
|
echo "== check_compulsive_blocker: an installed but unwrapped app warns =="
|
|
reset_state
|
|
sysfile usr/local/bin/block-compulsive-opening.sh
|
|
present_command discord
|
|
absent_command beeper signal-desktop
|
|
check_compulsive_blocker >"${TEST_TMPDIR}/out.txt"
|
|
_t_called_in "$(cat "${TEST_TMPDIR}/out.txt")" "discord is installed but wrapper not applied" "the unwrapped app is named"
|
|
_t_eq "warning" "$(get_service_status "compulsive_blocker")" "an unwrapped app is a warning, not an error"
|
|
_t_not_called 'ran block_compulsive_opening' "a warning does not trigger the installer"
|
|
|
|
echo "== check_compulsive_blocker: a wrapped app is accepted =="
|
|
reset_state
|
|
sysfile usr/local/bin/block-compulsive-opening.sh
|
|
present_command discord
|
|
absent_command beeper signal-desktop
|
|
sysfile usr/bin/discord.orig
|
|
check_compulsive_blocker >"${TEST_TMPDIR}/out.txt"
|
|
_t_called_in "$(cat "${TEST_TMPDIR}/out.txt")" "discord wrapper installed" "a backed-up original counts as wrapped"
|
|
_t_eq "ok" "$(get_service_status "compulsive_blocker")" "a wrapped app leaves status ok"
|
|
|
|
echo "== check_compulsive_blocker: a symlinked wrapper without .orig is skipped =="
|
|
reset_state
|
|
sysfile usr/local/bin/block-compulsive-opening.sh
|
|
present_command discord
|
|
absent_command beeper signal-desktop
|
|
# A symlink at /usr/bin/<app> with no .orig beside it takes the outer branch but
|
|
# not the inner one -- neither "wrapped" nor "unwrapped", so nothing is said.
|
|
ln -sf "${SERVICES_ROOT}/usr/local/bin/block-compulsive-opening.sh" "${SERVICES_ROOT}/usr/bin/discord"
|
|
check_compulsive_blocker >/dev/null
|
|
_t_eq "ok" "$(get_service_status "compulsive_blocker")" "a symlink without .orig leaves status ok"
|
|
|
|
echo "== check_compulsive_blocker: an unwrapped app plus a missing blocker is an error =="
|
|
reset_state
|
|
make_installer "$COMPULSIVE_BLOCK_SCRIPT"
|
|
present_command discord
|
|
absent_command beeper signal-desktop
|
|
check_compulsive_blocker >/dev/null
|
|
# The error from the missing blocker must not be downgraded by the app warning.
|
|
_t_eq "error" "$(get_service_status "compulsive_blocker")" "an error is not downgraded by a later warning"
|
|
_t_called 'ran block_compulsive_opening' "the installer still runs"
|
|
|
|
echo "== check_compulsive_blocker: --status and a missing installer =="
|
|
reset_state
|
|
absent_command beeper signal-desktop discord
|
|
make_installer "$COMPULSIVE_BLOCK_SCRIPT"
|
|
STATUS_ONLY=1
|
|
check_compulsive_blocker >/dev/null
|
|
_t_not_called 'ran block_compulsive_opening' "--status never installs"
|
|
|
|
reset_state
|
|
absent_command beeper signal-desktop discord
|
|
rm -f "$COMPULSIVE_BLOCK_SCRIPT"
|
|
check_compulsive_blocker >/dev/null
|
|
_t_eq "1" "${#MISSING_SCRIPTS[@]}" "a missing installer is recorded"
|
|
|
|
echo "== check_leechblock: installed with a desktop entry =="
|
|
reset_state
|
|
sysfile "home/${TEST_USER}/.local/share/leechblockng/manifest.json"
|
|
sysfile "home/${TEST_USER}/.local/share/applications/thorium-leechblock.desktop"
|
|
check_leechblock >"${TEST_TMPDIR}/out.txt"
|
|
_t_called_in "$(cat "${TEST_TMPDIR}/out.txt")" "LeechBlock desktop entry found" "the desktop entry is found"
|
|
_t_eq "ok" "$(get_service_status "leechblock")" "a full install records ok"
|
|
|
|
echo "== check_leechblock: the capitalised glob is matched too =="
|
|
reset_state
|
|
sysfile "home/${TEST_USER}/.local/share/leechblockng/manifest.json"
|
|
sysfile "home/${TEST_USER}/.local/share/applications/LeechBlock-thorium.desktop"
|
|
check_leechblock >/dev/null
|
|
_t_eq "ok" "$(get_service_status "leechblock")" "a LeechBlock-cased entry also counts"
|
|
|
|
echo "== check_leechblock: installed but no desktop entry warns =="
|
|
reset_state
|
|
sysfile "home/${TEST_USER}/.local/share/leechblockng/manifest.json"
|
|
mkdir -p "${SERVICES_ROOT}/home/${TEST_USER}/.local/share/applications"
|
|
check_leechblock >"${TEST_TMPDIR}/out.txt"
|
|
_t_called_in "$(cat "${TEST_TMPDIR}/out.txt")" "No LeechBlock desktop entries found" "the missing entry is reported"
|
|
_t_eq "warning" "$(get_service_status "leechblock")" "a missing desktop entry is only a warning"
|
|
_t_not_called 'ran install_leechblock' "a warning does not trigger the installer"
|
|
|
|
echo "== check_leechblock: not installed at all runs the installer as the user =="
|
|
reset_state
|
|
make_installer "$LEECHBLOCK_SCRIPT"
|
|
check_leechblock >/dev/null
|
|
_t_called "sudo -u ${TEST_USER} bash" "the installer runs as the invoking user, not root"
|
|
_t_eq "1" "$FIXES_APPLIED" "the fix is counted"
|
|
|
|
echo "== check_leechblock: --status and a missing installer =="
|
|
reset_state
|
|
make_installer "$LEECHBLOCK_SCRIPT"
|
|
STATUS_ONLY=1
|
|
check_leechblock >/dev/null
|
|
_t_not_called 'sudo -u' "--status never installs"
|
|
|
|
reset_state
|
|
rm -f "$LEECHBLOCK_SCRIPT"
|
|
check_leechblock >/dev/null
|
|
_t_eq "1" "${#MISSING_SCRIPTS[@]}" "a missing leechblock installer is recorded"
|
|
|
|
_t_summary
|