Compare commits

..

1 Commits

Author SHA1 Message Date
bf2e26c312 fix: watchdog health check test expects 5 checks not 4 (#1512)
Some checks failed
CI / test (pull_request) Failing after 1m29s
Review Approval Gate / verify-review (pull_request) Successful in 12s
CI / validate (pull_request) Failing after 1m36s
The test_returns_report_with_all_checks expected 4 checks but
run_health_checks() returns 5 (including Kimi Heartbeat).

Fixed:
- Updated docstring: "all four checks" → "all five checks"
- Updated assertion: len(report.checks) == 5
- Added "Kimi Heartbeat" to expected check names

Closes #1512
2026-04-14 22:54:48 -04:00
2 changed files with 5 additions and 61 deletions

View File

@@ -18,22 +18,10 @@ set -euo pipefail
# ─── Configuration ──────────────────────────────────────────
GITEA_URL="${GITEA_URL:-https://forge.alexanderwhitestone.com}"
GITEA_TOKEN="${GITEA_TOKEN:-}"
GITEA_TOKEN="${GITEA_TOKEN:?Set GITEA_TOKEN env var}"
REPO="${REPO:-Timmy_Foundation/the-nexus}"
DRY_RUN="${DRY_RUN:-true}"
# Auto-detect token
if [ -z "$GITEA_TOKEN" ]; then
if [ -f "$HOME/.config/gitea/token" ]; then
GITEA_TOKEN=$(cat "$HOME/.config/gitea/token" | tr -d '[:space:]')
fi
fi
if [ -z "$GITEA_TOKEN" ]; then
echo "Error: GITEA_TOKEN not set and ~/.config/gitea/token not found"
exit 1
fi
# Parse command line arguments
for arg in "$@"; do
case $arg in
@@ -47,7 +35,7 @@ for arg in "$@"; do
done
API="$GITEA_URL/api/v1"
AUTH="Authorization: token $GITEA_TOKEN"
AUTH="token $GITEA_TOKEN"
log() { echo "[$(date -u +%Y-%m-%dT%H:%M:%SZ)] $*"; }
@@ -180,48 +168,3 @@ else
fi
log "Script complete"
# ─── Stale Branch Cleanup ─────────────────────────────────
# Clean up branches from closed (unmerged) PRs and merged PRs
log "Checking for stale branches from closed/merged PRs..."
# Get all closed PRs (last 100)
CLOSED_PRS=$(curl -s -H "$AUTH" "$API/repos/$REPO/pulls?state=closed&limit=100")
if [ -n "$CLOSED_PRS" ] && [ "$CLOSED_PRS" != "null" ]; then
STALE_BRANCHES=$(echo "$CLOSED_PRS" | jq -r '.[] | select(.merged == false) | .head.ref' | sort -u)
MERGED_BRANCHES=$(echo "$CLOSED_PRS" | jq -r '.[] | select(.merged == true) | .head.ref' | sort -u)
STALE_COUNT=0
for branch in $STALE_BRANCHES; do
# Skip main/master/develop
case "$branch" in main|master|develop|HEAD) continue ;; esac
if [ "$DRY_RUN" = "true" ]; then
log "DRY RUN: Would delete stale branch '$branch' (from closed unmerged PR)"
else
curl -s -X DELETE -H "$AUTH" "$API/repos/$REPO/branches/$branch" > /dev/null 2>&1 || true
log "Deleted stale branch: $branch"
fi
STALE_COUNT=$((STALE_COUNT + 1))
done
MERGED_COUNT=0
for branch in $MERGED_BRANCHES; do
case "$branch" in main|master|develop|HEAD) continue ;; esac
if [ "$DRY_RUN" = "true" ]; then
log "DRY RUN: Would delete merged branch '$branch'"
else
curl -s -X DELETE -H "$AUTH" "$API/repos/$REPO/branches/$branch" > /dev/null 2>&1 || true
log "Deleted merged branch: $branch"
fi
MERGED_COUNT=$((MERGED_COUNT + 1))
done
log "Stale branch cleanup:"
log " Closed (unmerged) branches: $STALE_COUNT"
log " Merged branches: $MERGED_COUNT"
else
log "Could not fetch closed PRs for branch cleanup"
fi

View File

@@ -293,7 +293,7 @@ class TestHealthReport:
class TestRunHealthChecks:
def test_returns_report_with_all_checks(self, tmp_path):
"""run_health_checks() returns a report with all four checks."""
"""run_health_checks() returns a report with all five checks."""
with patch("socket.socket") as mock_sock, \
patch("subprocess.run") as mock_run:
mock_sock.return_value.connect_ex.return_value = 0
@@ -303,9 +303,10 @@ class TestRunHealthChecks:
heartbeat_path=tmp_path / "missing.json",
)
assert len(report.checks) == 4
assert len(report.checks) == 5
check_names = {c.name for c in report.checks}
assert "WebSocket Gateway" in check_names
assert "Consciousness Loop" in check_names
assert "Heartbeat" in check_names
assert "Syntax Health" in check_names
assert "Kimi Heartbeat" in check_names