mirrors/Mole
1
0
Fork 0
mirror of https://github.com/tw93/Mole.git synced 2026-03-22 17:55:08 +00:00
Code Activity

fix(check): use softwareupdate output for macOS update detection

Browse Source 
Replace LastRecommendedUpdatesAvailable defaults check with unified
softwareupdate -l --no-scan parsing.  Add caching layer and teach the
parser to distinguish macOS updates, Background Security Improvements,
Rapid Security Responses, and non-macOS entries so each gets an
accurate title in the output.

Fix reset_softwareupdate_cache() to also reset the in-memory
SOFTWARE_UPDATE_LIST_LOADED flag, and add a regression test.

Closes #585
This commit is contained in:
Tw93
2026-03-18 14:48:39 +08:00
parent 25892594b0
commit f88b2116ab
2 changed files with 210 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
tests/clean_system_maintenance.bats
View File

@@ -498,14 +498,12 @@ EOF
[[ "$output" == *"COUNTS=0:0:0"* ]]
}
@test "check_macos_update avoids slow softwareupdate scans" {
@test "check_macos_update reports background security improvements as macOS updates" {
run bash --noprofile --norc << 'EOF'
set -euo pipefail
source "$PROJECT_ROOT/lib/core/common.sh"
source "$PROJECT_ROOT/lib/check/all.sh"
defaults() { echo "1"; }
run_with_timeout() {
local timeout="${1:-}"
shift
@@ -518,7 +516,8 @@ run_with_timeout() {
Software Update Tool
Software Update found the following new or updated software:
* Label: macOS 99
* Label: macOS Background Security Improvement (a)-25D771280a
Title: macOS Background Security Improvement (a), Version: 26.3.1 (a), Size: 208896KiB, Recommended: YES, Action: restart,
OUT
return 0
fi
@@ -533,7 +532,7 @@ echo "MACOS_UPDATE_AVAILABLE=$MACOS_UPDATE_AVAILABLE"
EOF
[ "$status" -eq 0 ]
[[ "$output" == *"Update available"* ]]
[[ "$output" == *"Background Security Improvement"* ]]
[[ "$output" == *"MACOS_UPDATE_AVAILABLE=true"* ]]
[[ "$output" != *"BAD_TIMEOUT:"* ]]
}
@@ -544,8 +543,6 @@ set -euo pipefail
source "$PROJECT_ROOT/lib/core/common.sh"
source "$PROJECT_ROOT/lib/check/all.sh"
defaults() { echo "1"; }
run_with_timeout() {
local timeout="${1:-}"
shift
@@ -578,14 +575,12 @@ EOF
[[ "$output" != *"BAD_TIMEOUT:"* ]]
}
@test "check_macos_update keeps update flag when softwareupdate times out" {
@test "check_macos_update ignores non-macOS softwareupdate entries" {
run bash --noprofile --norc << 'EOF'
set -euo pipefail
source "$PROJECT_ROOT/lib/core/common.sh"
source "$PROJECT_ROOT/lib/check/all.sh"
defaults() { echo "1"; }
run_with_timeout() {
local timeout="${1:-}"
shift
@@ -594,40 +589,13 @@ run_with_timeout() {
return 124
fi
if [[ "${1:-}" == "softwareupdate" && "${2:-}" == "-l" && "${3:-}" == "--no-scan" ]]; then
return 124
fi
return 124
}
cat <<'OUT'
Software Update Tool
start_inline_spinner(){ :; }
stop_inline_spinner(){ :; }
check_macos_update
echo "MACOS_UPDATE_AVAILABLE=$MACOS_UPDATE_AVAILABLE"
EOF
[ "$status" -eq 0 ]
[[ "$output" == *"Update available"* ]]
[[ "$output" == *"MACOS_UPDATE_AVAILABLE=true"* ]]
[[ "$output" != *"BAD_TIMEOUT:"* ]]
}
@test "check_macos_update keeps update flag when softwareupdate returns empty output" {
run bash --noprofile --norc << 'EOF'
set -euo pipefail
source "$PROJECT_ROOT/lib/core/common.sh"
source "$PROJECT_ROOT/lib/check/all.sh"
defaults() { echo "1"; }
run_with_timeout() {
local timeout="${1:-}"
shift
if [[ "$timeout" != "10" ]]; then
echo "BAD_TIMEOUT:$timeout"
return 124
fi
if [[ "${1:-}" == "softwareupdate" && "${2:-}" == "-l" && "${3:-}" == "--no-scan" ]]; then
Software Update found the following new or updated software:
* Label: Numbers-14.4
Title: Numbers, Version: 14.4, Size: 51200KiB, Recommended: YES, Action: none,
OUT
return 0
fi
return 124
@@ -641,22 +609,69 @@ echo "MACOS_UPDATE_AVAILABLE=$MACOS_UPDATE_AVAILABLE"
EOF
[ "$status" -eq 0 ]
[[ "$output" == *"Update available"* ]]
[[ "$output" == *"MACOS_UPDATE_AVAILABLE=true"* ]]
[[ "$output" == *"System up to date"* ]]
[[ "$output" == *"MACOS_UPDATE_AVAILABLE=false"* ]]
[[ "$output" != *"BAD_TIMEOUT:"* ]]
}
@test "check_macos_update skips softwareupdate when defaults shows no updates" {
@test "get_software_updates caches softwareupdate output in memory" {
run bash --noprofile --norc << 'EOF'
set -euo pipefail
source "$PROJECT_ROOT/lib/core/common.sh"
source "$PROJECT_ROOT/lib/check/all.sh"
defaults() { echo "0"; }
calls=0
run_with_timeout() {
local timeout="${1:-}"
shift
if [[ "$timeout" != "10" ]]; then
echo "BAD_TIMEOUT:$timeout"
return 124
fi
if [[ "${1:-}" == "softwareupdate" && "${2:-}" == "-l" && "${3:-}" == "--no-scan" ]]; then
calls=$((calls + 1))
cat <<'OUT'
Software Update Tool
No new software available.
OUT
return 0
fi
return 124
}
first="$(get_software_updates)"
second="$(get_software_updates)"
printf 'CALLS=%s\n' "$calls"
printf 'FIRST=%s\n' "$first"
printf 'SECOND=%s\n' "$second"
EOF
[ "$status" -eq 0 ]
[[ "$output" == *"CALLS=1"* ]]
[[ "$output" == *"FIRST=Software Update Tool"* ]]
[[ "$output" == *"SECOND=Software Update Tool"* ]]
[[ "$output" != *"BAD_TIMEOUT:"* ]]
}
@test "check_macos_update uses cached softwareupdate output when available" {
run bash --noprofile --norc << 'EOF'
set -euo pipefail
source "$PROJECT_ROOT/lib/core/common.sh"
source "$PROJECT_ROOT/lib/check/all.sh"
mkdir -p "$HOME/.cache/mole"
cat > "$HOME/.cache/mole/softwareupdate_list" <<'OUT'
Software Update Tool
Software Update found the following new or updated software:
* Label: macOS 99
Title: macOS 99, Version: 99.1, Size: 1024KiB, Recommended: YES, Action: restart,
OUT
run_with_timeout() {
echo "SHOULD_NOT_CALL_SOFTWAREUPDATE"
return 0
return 124
}
check_macos_update
@@ -664,19 +679,64 @@ echo "MACOS_UPDATE_AVAILABLE=$MACOS_UPDATE_AVAILABLE"
EOF
[ "$status" -eq 0 ]
[[ "$output" == *"System up to date"* ]]
[[ "$output" == *"MACOS_UPDATE_AVAILABLE=false"* ]]
[[ "$output" == *"macOS 99, Version: 99.1"* ]]
[[ "$output" == *"MACOS_UPDATE_AVAILABLE=true"* ]]
[[ "$output" != *"SHOULD_NOT_CALL_SOFTWAREUPDATE"* ]]
}
@test "reset_softwareupdate_cache clears in-memory softwareupdate state" {
run bash --noprofile --norc << 'EOF'
set -euo pipefail
source "$PROJECT_ROOT/lib/core/common.sh"
source "$PROJECT_ROOT/lib/check/all.sh"
calls_file="$HOME/softwareupdate_calls"
printf '0\n' > "$calls_file"
first_file="$HOME/first_updates.txt"
second_file="$HOME/second_updates.txt"
rm -f "$HOME/.cache/mole/softwareupdate_list"
SOFTWARE_UPDATE_LIST=""
SOFTWARE_UPDATE_LIST_LOADED="false"
run_with_timeout() {
local timeout="${1:-}"
shift
if [[ "${1:-}" == "softwareupdate" && "${2:-}" == "-l" && "${3:-}" == "--no-scan" ]]; then
local calls
calls=$(cat "$calls_file")
calls=$((calls + 1))
printf '%s\n' "$calls" > "$calls_file"
cat <<OUT
Software Update Tool
* Label: macOS $calls
Title: macOS $calls, Version: $calls.0, Size: 1024KiB, Recommended: YES, Action: restart,
OUT
return 0
fi
return 124
}
get_software_updates > "$first_file"
reset_softwareupdate_cache
get_software_updates > "$second_file"
printf 'CALLS=%s\n' "$(cat "$calls_file")"
printf 'FIRST=%s\n' "$(cat "$first_file")"
printf 'SECOND=%s\n' "$(cat "$second_file")"
EOF
[ "$status" -eq 0 ]
[[ "$output" == *"CALLS=2"* ]]
[[ "$output" == *"FIRST=Software Update Tool"* ]]
[[ "$output" == *"SECOND=Software Update Tool"* ]]
[[ "$output" == *"macOS 2"* ]]
}
@test "check_macos_update outputs debug info when MO_DEBUG set" {
run bash --noprofile --norc << 'EOF'
set -euo pipefail
source "$PROJECT_ROOT/lib/core/common.sh"
source "$PROJECT_ROOT/lib/check/all.sh"
defaults() { echo "1"; }
export MO_DEBUG=1
run_with_timeout() {
@@ -696,7 +756,7 @@ check_macos_update 2>&1
EOF
[ "$status" -eq 0 ]
[[ "$output" == *"[DEBUG] softwareupdate exit status:"* ]]
[[ "$output" == *"[DEBUG] softwareupdate cached output lines:"* ]]
}
@test "run_with_timeout succeeds without GNU timeout" {