From 14eecb5b8e76cf1b1de20643d496dc94cfdce0ab Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Mon, 11 May 2026 17:19:56 -0500 Subject: fix(testing): drop stale plugin checks, count failed validations validate_hyprland_plugins and validate_hyprpm_hook checked for the hyprland-plugins-setup script and the hyprpm pacman hook, both removed in 4a3056a (Hyprland 0.54 brings the layouts into core). I deleted the two functions and their calls in validate_window_manager. I also disabled errexit in run-test.sh from the validation phase onward, so one failed check is counted in VALIDATION_FAILED instead of aborting the run before the report or VM cleanup. About 16 validations across the file do a bare `return 1` after `validation_fail`; any of them firing under the previous behavior would have killed the harness mid-run. --- scripts/testing/lib/validation.sh | 51 --------------------------------------- 1 file changed, 51 deletions(-) (limited to 'scripts/testing/lib') diff --git a/scripts/testing/lib/validation.sh b/scripts/testing/lib/validation.sh index 5fa747d..5d9587d 100644 --- a/scripts/testing/lib/validation.sh +++ b/scripts/testing/lib/validation.sh @@ -534,63 +534,12 @@ validate_portal_dark_mode() { fi } -validate_hyprland_plugins() { - step "Checking Hyprland plugins setup script" - - # Plugins are installed on first login via hyprland-plugins-setup script - # (hyprpm requires running Hyprland to determine version for compilation) - # Validate that the setup script exists and is executable - local setup_script="/home/cjennings/.local/bin/hyprland-plugins-setup" - if ! ssh_cmd "test -x $setup_script"; then - validation_fail "Hyprland plugins setup script not found or not executable" - attribute_issue "hyprland-plugins-setup script missing" "archsetup" - return 1 - fi - - # Check that hyprland.conf calls the setup script - if ssh_cmd "grep -q 'hyprland-plugins-setup' /home/cjennings/.config/hypr/hyprland.conf"; then - validation_pass "Hyprland plugins setup configured (installs on first login)" - else - validation_fail "hyprland.conf doesn't call hyprland-plugins-setup" - attribute_issue "hyprland-plugins-setup not in hyprland.conf" "archsetup" - fi -} - -validate_hyprpm_hook() { - step "Checking hyprpm pacman hook" - - local hook_file="/etc/pacman.d/hooks/hyprpm.hook" - if ! ssh_cmd "test -f $hook_file"; then - validation_fail "hyprpm pacman hook not found at $hook_file" - attribute_issue "hyprpm pacman hook missing" "archsetup" - return 1 - fi - - # Verify hook targets hyprland package - if ! ssh_cmd "grep -q 'Target = hyprland' $hook_file"; then - validation_fail "hyprpm hook doesn't target hyprland package" - attribute_issue "hyprpm hook misconfigured" "archsetup" - return 1 - fi - - # Verify hook runs hyprpm update - if ! ssh_cmd "grep -q 'hyprpm update' $hook_file"; then - validation_fail "hyprpm hook doesn't run hyprpm update" - attribute_issue "hyprpm hook misconfigured" "archsetup" - return 1 - fi - - validation_pass "hyprpm pacman hook configured correctly" -} - validate_window_manager() { # Detect which desktop environment is installed and validate accordingly if ssh_cmd "pacman -Q hyprland &>/dev/null"; then section "Hyprland Desktop Environment" validate_hyprland_tools validate_hyprland_config - validate_hyprland_plugins - validate_hyprpm_hook validate_hyprland_socket validate_portal_dark_mode elif ssh_cmd "test -f /usr/local/bin/dwm"; then -- cgit v1.2.3