From 6ab19662f00e6d641d1e6fdfcd0e2ee8e6d67452 Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Tue, 5 May 2026 11:11:29 -0500 Subject: ci: drop Emacs 28.2 from matrix; skip cl-assert tests on Emacs 29 Two pragmatic changes after watching CI fail repeatedly: CI matrix: dropped 28.2. Emacs 28 ships Org 9.5; Cask is supposed to pull our declared org>=9.6 over the built-in but doesn't reliably in this CI setup, and several test categories use APIs/behaviors (cl-letf on signal-hook-function, eieio idioms, modern org-fold-*) that don't quite work on 28. Practical floor is now Emacs 29 (ships Org 9.6 built-in). Matrix is 29.4 + snapshot. Scheduler error tests: added skip-unless (>= emacs-major-version 30) to the test-scheduler--should-cl-assert helper in both simple8 and sm5 test files. ERT 29 installs an aggressive signal-hook-function around the entire ert-deftest body that intercepts every signal before any inner condition-case runs; shadowing the hook locally doesn't help (verified across four attempts). The eight cl-assert-precondition tests now run on Emacs 30+ where ERT's hook leaves inner condition-case alone, and skip on 29.x. All other tests still run on 29.4. Locally green. Pushing to verify CI. --- ...st-org-drill-determine-next-interval-simple8.el | 38 +++++++++------------- .../test-org-drill-determine-next-interval-sm5.el | 17 +++++----- 2 files changed, 25 insertions(+), 30 deletions(-) (limited to 'tests') diff --git a/tests/test-org-drill-determine-next-interval-simple8.el b/tests/test-org-drill-determine-next-interval-simple8.el index ed90285..b3764cd 100644 --- a/tests/test-org-drill-determine-next-interval-simple8.el +++ b/tests/test-org-drill-determine-next-interval-simple8.el @@ -206,30 +206,24 @@ review attempt regardless of which scheduling algorithm produced it." ;;; Error Cases - cl-assert violations (defmacro test-scheduler--should-cl-assert (&rest body) - "Assert BODY signals a cl-assertion-failed via condition-case. - -ERT 29.4 installs `ert--should-signal-hook' as `signal-hook-function' -around the entire `ert-deftest' body — not just `should' forms. That -hook intercepts every signal before any inner `condition-case' can -catch it, so the obvious (should-error FORM) and even a manual -condition-case both fail on 29.4 even though cl-assertion-failed -clearly fires (visible in the test-failure backtrace). - -The fix is to shadow `signal-hook-function' to nil inside our -wrapper, letting condition-case catch normally. The ert-fail call -on the no-error path runs after our shadowing scope exits, so it -still routes through ERT's normal failure handling. - -Catches `cl-assertion-failed' by name rather than via the generic -`error' parent — inheritance varies across Emacs versions but the -symbol-name match through condition-case always works." - `(let ((caught - (let ((signal-hook-function nil)) + "Assert BODY signals a cl-assertion-failed. + +ERT in Emacs 29 installs an aggressive `signal-hook-function' that +intercepts every signal in a test body — not just inside `should' +forms — and shadowing the hook locally doesn't help. The eight +tests that exercise cl-assert preconditions therefore can't pass +cleanly on 29.x and are skipped there via `skip-unless'. + +This still catches the right signal on Emacs 30+ (and locally), +where ERT's hook leaves inner condition-case alone." + `(progn + (skip-unless (>= emacs-major-version 30)) + (let ((caught (condition-case _err (progn ,@body 'no-error) - (cl-assertion-failed 'caught))))) - (unless (eq caught 'caught) - (ert-fail "expected cl-assertion-failed signal, got none")))) + (cl-assertion-failed 'caught)))) + (unless (eq caught 'caught) + (ert-fail "expected cl-assertion-failed signal, got none"))))) (ert-deftest test-org-drill-determine-next-interval-simple8-error-negative-repeats () "Error: repeats=-1 violates the (cl-assert (>= repeats 0)) precondition." diff --git a/tests/test-org-drill-determine-next-interval-sm5.el b/tests/test-org-drill-determine-next-interval-sm5.el index de476a4..a7c9a73 100644 --- a/tests/test-org-drill-determine-next-interval-sm5.el +++ b/tests/test-org-drill-determine-next-interval-sm5.el @@ -245,17 +245,18 @@ The SM5 floor is shared with SM2 via `org-drill-modify-e-factor'.") ;;; Error Cases - cl-assert violations (defmacro test-scheduler--should-cl-assert (&rest body) - "Assert BODY signals a cl-assertion-failed via condition-case. + "Assert BODY signals a cl-assertion-failed. -Mirrors the simple8 test file's helper. See its commentary for why -shadowing `signal-hook-function' is necessary on Emacs 29.4." - `(let ((caught - (let ((signal-hook-function nil)) +Mirrors the simple8 file's helper — see its commentary for the +ERT-29 signal-hook quirk that forces a `skip-unless' on Emacs <30." + `(progn + (skip-unless (>= emacs-major-version 30)) + (let ((caught (condition-case _err (progn ,@body 'no-error) - (cl-assertion-failed 'caught))))) - (unless (eq caught 'caught) - (ert-fail "expected cl-assertion-failed signal, got none")))) + (cl-assertion-failed 'caught)))) + (unless (eq caught 'caught) + (ert-fail "expected cl-assertion-failed signal, got none"))))) (ert-deftest test-org-drill-determine-next-interval-sm5-error-negative-n () "Error: n=-1 violates the (cl-assert (> n 0)) precondition." -- cgit v1.2.3