test: repair the seven files red under Emacs 31.1HEADmain

None of the seven was a config regression. Each file had its own cause:

- config-utilities: the tests mocked fboundp with cl-letf. fset on a subr autoloads comp-run, which requires bytecomp, whose defun of byte-compile-file replaced the mock installed earlier in the same cl-letf. 30.2 hid it because ert happened to load bytecomp first. I extracted cj/--compile-elisp-file with an injectable availability predicate (fboundp by default), made cj/compile-this-elisp-buffer the wrapper, and had the tests inject a predicate instead of redefining a primitive. Added the missing no-compiler case.
- system-defaults-functions: the file let-bound use-package-always-ensure before anything declared it special. 30.2 downgraded that to a "Failed to parse package recentf" warning; 31.1 moves the defcustom to autoload time, where it is fatal at load. One defvar before the let.
- calibredb-epub-config: the jump tests stubbed calibredb while it was still an autoload, so the module's require loaded the real definition over the stub and the real command always ran. Require calibredb before any stub.
- agenda-query--render: org 9.8.7 parses the priority cookie with (looking-at org-priority-regexp), whose lazy prefix swallows everything between the stars and the cookie. The fixture now has no cookie and pins that the keyword is not recognised.
- prog-general-yas-activation: python-ts-mode prompts to install a missing grammar, which a batch run cannot answer. The test skips on treesit-ready-p rather than on the mode existing, and the module comment says why.
- integration-recurring-events: the fixtures are America/Chicago and the assertions expect Chicago rendering, so the file only passed on a machine in Central time. TZ is pinned in setup and restored in teardown.

The integration failure had been invisible since 08-17 because make test stops after a red unit phase. make test exits 0 again for the first time since then.

8 files changed, 152 insertions, 67 deletions

diff --git a/modules/config-utilities.el b/modules/config-utilities.el
index 4332f407..62fc29d0 100644
--- a/modules/config-utilities.el
+++ b/modules/config-utilities.el
@@ -196,27 +196,27 @@ Returns the count of files deleted."
              count user-emacs-directory)))
 (keymap-set cj/debug-config-keymap "c d" 'cj/delete-emacs-home-compiled-files)
 
-(defun cj/compile-this-elisp-buffer ()
-  "Compile the current .el: prefer native (.eln), else .elc. Message if neither."
-  (interactive)
-  (unless (and buffer-file-name (string-match-p "\\.el\\'" buffer-file-name))
-    (user-error "Not visiting a .el file"))
-  (save-buffer)
-  (let ((file buffer-file-name))
+(defun cj/--compile-elisp-file (file &optional available-p)
+  "Compile FILE: prefer async native, then sync native, then byte-compile.
+AVAILABLE-P decides which compilers exist; it defaults to `fboundp'.  It is
+a parameter so tests can force each branch without redefining `fboundp':
+an `fset' on that subr pulls in comp-run and bytecomp, whose own `defun'
+of `byte-compile-file' then lands on top of any test double."
+  (let ((available-p (or available-p #'fboundp)))
     (cond
      ;; Native compilation (async preferred)
-     ((fboundp 'native-compile-async)
+     ((funcall available-p 'native-compile-async)
       (native-compile-async file)
       (message "Queued native compilation for %s" file))
      ;; Native compilation (sync, if async not available)
-     ((fboundp 'native-compile)
+     ((funcall available-p 'native-compile)
       (condition-case err
           (progn
             (native-compile file)
             (message "Native-compiled %s" file))
         (error (message "Native compile failed: %s" (error-message-string err)))))
      ;; Byte-compile fallback
-     ((fboundp 'byte-compile-file)
+     ((funcall available-p 'byte-compile-file)
       (let ((out (byte-compile-file file)))
         (if out
             (message "Byte-compiled -> %s" out)
@@ -224,6 +224,14 @@ Returns the count of files deleted."
      ;; Neither facility available
      (t
       (message "No compilation available (no native-compile, no byte-compile)")))))
+
+(defun cj/compile-this-elisp-buffer ()
+  "Compile the current .el: prefer native (.eln), else .elc. Message if neither."
+  (interactive)
+  (unless (and buffer-file-name (string-match-p "\\.el\\'" buffer-file-name))
+    (user-error "Not visiting a .el file"))
+  (save-buffer)
+  (cj/--compile-elisp-file buffer-file-name))
 (keymap-set cj/debug-config-keymap "c ." 'cj/compile-this-elisp-buffer)
 
 ;; --------------------------- Information Reporting ---------------------------
diff --git a/modules/prog-general.el b/modules/prog-general.el
index 77ff88a5..e9586a97 100644
--- a/modules/prog-general.el
+++ b/modules/prog-general.el
@@ -119,9 +119,11 @@ REGEXP must be a string or an rx form."
 
 ;; Manages tree-sitter grammars.  Install is 'prompt, never t: with t,
 ;; merely opening a file could trigger a network download and a compiler
-;; build mid-edit.  Batch/test runs never load treesit-auto (no package
-;; init), so they can never install.  Fresh-machine bootstrap is the
-;; explicit `cj/install-treesit-grammars' command below.
+;; build mid-edit.  `make test' runs with no package init and so never
+;; loads treesit-auto, but a test file that calls `package-initialize'
+;; itself does load it, and a tree-sitter mode then prompts for a missing
+;; grammar; such tests must skip on `treesit-ready-p'.  Fresh-machine
+;; bootstrap is the explicit `cj/install-treesit-grammars' command below.
 (defun cj/treesit-auto-pin-go-revision (recipes)
   "Pin the Go grammar revision in treesit-auto RECIPES.
 Return the updated Go recipe, or nil when RECIPES has no Go entry.
diff --git a/tests/test-agenda-query--render.el b/tests/test-agenda-query--render.el
index 48d28773..da5c3f60 100644
--- a/tests/test-agenda-query--render.el
+++ b/tests/test-agenda-query--render.el
@@ -162,10 +162,17 @@ still parses as JSON, which is the worst kind."
 Pinning the failure mode, not endorsing it.  This is what the surface showed
 before the batch writer learned the vocabulary, and it is why the test above
 exists."
+  ;; No priority cookie in this fixture.  org 9.8 (Emacs 31.1) parses the
+  ;; cookie with `org-priority-regexp' under `looking-at', and that regexp's
+  ;; lazy `.*?' prefix swallows everything between the stars and the cookie,
+  ;; unknown keyword included.  A cookie here would test org's bug rather than
+  ;; the vocabulary gap this test pins.
   (let ((org-todo-keywords '((sequence "TODO" "|" "DONE"))))
     (test-aq-render--with-agenda-file
-        "* DOING [#A] Justin Johns advisor projects\nSCHEDULED: <2026-07-31 Fri 09:00>\n"
-      (should (string-prefix-p "DOING" (alist-get 't (car rows)))))))
+        "* DOING Justin Johns advisor projects\nSCHEDULED: <2026-07-31 Fri 09:00>\n"
+      (let ((row (car rows)))
+        (should (string-prefix-p "DOING" (alist-get 't row)))
+        (should-not (equal "DOING" (alist-get 'keyword row)))))))
 
 ;;; ---------- the cache writer ----------
 
diff --git a/tests/test-calibredb-epub-config.el b/tests/test-calibredb-epub-config.el
index 7afc58f3..0e430a4e 100644
--- a/tests/test-calibredb-epub-config.el
+++ b/tests/test-calibredb-epub-config.el
@@ -16,6 +16,11 @@
 (package-initialize)
 (add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
 (require 'calibredb-epub-config)
+;; Load calibredb before any test stubs its functions with `cl-letf'.  The
+;; module's jump path calls `(require 'calibredb)' inside the body; if the
+;; package is still an autoload at that point, the real `defun' lands on top of
+;; the stub and the test runs the real command against the real library.
+(require 'calibredb)
 (require 'nov nil t)  ; for the nov-mode-map keybinding test; harmless if absent
 
 (declare-function cj/nov--text-width "calibredb-epub-config" (total-cols))
diff --git a/tests/test-config-utilities--compile-this-elisp-buffer.el b/tests/test-config-utilities--compile-this-elisp-buffer.el
index a06440ab..f1a442b4 100644
--- a/tests/test-config-utilities--compile-this-elisp-buffer.el
+++ b/tests/test-config-utilities--compile-this-elisp-buffer.el
@@ -1,10 +1,14 @@
 ;;; test-config-utilities--compile-this-elisp-buffer.el --- Tests for cj/compile-this-elisp-buffer -*- lexical-binding: t; -*-
 
 ;;; Commentary:
-;; Tests for `cj/compile-this-elisp-buffer'. The function dispatches
-;; among native-compile-async, native-compile (sync), and
-;; byte-compile-file based on which is fboundp. Tests force each
-;; branch by mocking fboundp at the boundary.
+;; Tests for `cj/compile-this-elisp-buffer' and its helper
+;; `cj/--compile-elisp-file'.  The helper dispatches among
+;; native-compile-async, native-compile (sync), and byte-compile-file based
+;; on an AVAILABLE-P predicate that defaults to `fboundp'.  Tests force each
+;; branch by passing the predicate, never by redefining `fboundp': an `fset'
+;; on that subr autoloads comp-run, which requires bytecomp, whose `defun' of
+;; `byte-compile-file' replaces any test double installed earlier in the same
+;; `cl-letf' (Emacs 30.2 hid this because ert happened to preload bytecomp).
 
 ;;; Code:
 
@@ -14,6 +18,10 @@
 (add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
 (require 'config-utilities)
 
+(defun test-config-utilities--available (&rest syms)
+  "Return a predicate that reports only SYMS as available compilers."
+  (lambda (sym) (memq sym syms)))
+
 (defmacro test-config-utilities--with-elisp-buffer (path &rest body)
   "Run BODY in a temp buffer visiting PATH (a .el file path).
 Skips the interactive `save-buffer' so tests stay free of disk side
@@ -24,72 +32,108 @@ effects."
      (cl-letf (((symbol-function 'save-buffer) (lambda (&rest _) nil)))
        ,@body)))
 
+;; -- the interactive wrapper -------------------------------------------------
+
 (ert-deftest test-config-utilities-compile-buffer-not-elisp-raises ()
   "Error: a buffer whose file isn't .el raises `user-error'."
   (test-config-utilities--with-elisp-buffer "/tmp/not-elisp.txt"
     (should-error (cj/compile-this-elisp-buffer) :type 'user-error)))
 
-(ert-deftest test-config-utilities-compile-buffer-no-buffer-file-name-raises ()
-  "Error: a buffer with no `buffer-file-name' raises `user-error'."
+(ert-deftest test-config-utilities-compile-buffer-no-file-raises ()
+  "Boundary: a buffer visiting no file raises `user-error' rather than
+passing nil to the compiler."
   (with-temp-buffer
-    (setq buffer-file-name nil)
     (should-error (cj/compile-this-elisp-buffer) :type 'user-error)))
 
+(ert-deftest test-config-utilities-compile-buffer-saves-then-delegates ()
+  "Normal: the wrapper saves the buffer and hands its file to the helper."
+  (let (saved compiled)
+    (with-temp-buffer
+      (setq buffer-file-name "/tmp/some.el")
+      (cl-letf (((symbol-function 'save-buffer) (lambda (&rest _) (setq saved t)))
+                ((symbol-function 'cj/--compile-elisp-file)
+                 (lambda (file &optional _) (setq compiled file))))
+        (cj/compile-this-elisp-buffer)))
+    (should saved)
+    (should (equal compiled "/tmp/some.el"))))
+
+;; -- the helper's dispatch ---------------------------------------------------
+
 (ert-deftest test-config-utilities-compile-buffer-prefers-native-async ()
   "Normal: `native-compile-async' is preferred when available."
   (let (called-with)
-    (test-config-utilities--with-elisp-buffer "/tmp/some.el"
-      (cl-letf (((symbol-function 'fboundp)
-                 (lambda (sym)
-                   (memq sym '(native-compile-async native-compile byte-compile-file))))
-                ((symbol-function 'native-compile-async)
-                 (lambda (file) (setq called-with file)))
-                ((symbol-function 'native-compile)
-                 (lambda (_) (error "should not call sync native-compile")))
-                ((symbol-function 'byte-compile-file)
-                 (lambda (&rest _) (error "should not call byte-compile-file"))))
-        (cj/compile-this-elisp-buffer)
-        (should (equal called-with "/tmp/some.el"))))))
+    (cl-letf (((symbol-function 'native-compile-async)
+               (lambda (file) (setq called-with file)))
+              ((symbol-function 'native-compile)
+               (lambda (_) (error "should not call sync native-compile")))
+              ((symbol-function 'byte-compile-file)
+               (lambda (&rest _) (error "should not call byte-compile-file"))))
+      (cj/--compile-elisp-file
+       "/tmp/some.el"
+       (test-config-utilities--available 'native-compile-async 'native-compile
+                                         'byte-compile-file))
+      (should (equal called-with "/tmp/some.el")))))
 
 (ert-deftest test-config-utilities-compile-buffer-falls-back-to-sync-native ()
   "Normal: `native-compile' is used when async isn't available."
   (let (called-with)
-    (test-config-utilities--with-elisp-buffer "/tmp/some.el"
-      (cl-letf (((symbol-function 'fboundp)
-                 (lambda (sym) (memq sym '(native-compile byte-compile-file))))
-                ((symbol-function 'native-compile)
-                 (lambda (file) (setq called-with file)))
-                ((symbol-function 'byte-compile-file)
-                 (lambda (&rest _) (error "should not call byte-compile-file"))))
-        (cj/compile-this-elisp-buffer)
-        (should (equal called-with "/tmp/some.el"))))))
+    (cl-letf (((symbol-function 'native-compile)
+               (lambda (file) (setq called-with file)))
+              ((symbol-function 'byte-compile-file)
+               (lambda (&rest _) (error "should not call byte-compile-file"))))
+      (cj/--compile-elisp-file
+       "/tmp/some.el"
+       (test-config-utilities--available 'native-compile 'byte-compile-file))
+      (should (equal called-with "/tmp/some.el")))))
 
 (ert-deftest test-config-utilities-compile-buffer-falls-back-to-byte-compile ()
   "Normal: `byte-compile-file' is used when neither native option is available."
   (let (called-with)
-    (test-config-utilities--with-elisp-buffer "/tmp/some.el"
-      (cl-letf (((symbol-function 'fboundp)
-                 (lambda (sym) (eq sym 'byte-compile-file)))
-                ((symbol-function 'byte-compile-file)
-                 (lambda (file &rest _) (setq called-with file) "/tmp/some.elc")))
-        (cj/compile-this-elisp-buffer)
-        (should (equal called-with "/tmp/some.el"))))))
+    (cl-letf (((symbol-function 'byte-compile-file)
+               (lambda (file &rest _) (setq called-with file) "/tmp/some.elc")))
+      (cj/--compile-elisp-file
+       "/tmp/some.el"
+       (test-config-utilities--available 'byte-compile-file))
+      (should (equal called-with "/tmp/some.el")))))
+
+(ert-deftest test-config-utilities-compile-buffer-reports-when-nothing-available ()
+  "Boundary: with no compiler available the helper only messages, calling none."
+  (let (captured)
+    (cl-letf (((symbol-function 'native-compile-async)
+               (lambda (&rest _) (error "should not call native-compile-async")))
+              ((symbol-function 'native-compile)
+               (lambda (&rest _) (error "should not call native-compile")))
+              ((symbol-function 'byte-compile-file)
+               (lambda (&rest _) (error "should not call byte-compile-file")))
+              ((symbol-function 'message)
+               (lambda (fmt &rest args) (setq captured (apply #'format fmt args)))))
+      (cj/--compile-elisp-file "/tmp/some.el" (test-config-utilities--available)))
+    (should (string-match-p "No compilation available" captured))))
 
 (ert-deftest test-config-utilities-compile-buffer-handles-sync-native-error ()
   "Error: a sync `native-compile' that signals is caught and reported.
-Asserts no error escapes by running the function and checking that the
+Asserts no error escapes by running the helper and checking that the
 message captured contains the failure prefix."
-  (test-config-utilities--with-elisp-buffer "/tmp/some.el"
-    (let (captured)
-      (cl-letf (((symbol-function 'fboundp)
-                 (lambda (sym) (memq sym '(native-compile byte-compile-file))))
-                ((symbol-function 'native-compile)
-                 (lambda (_) (error "boom")))
-                ((symbol-function 'message)
-                 (lambda (fmt &rest args)
-                   (setq captured (apply #'format fmt args)))))
-        (cj/compile-this-elisp-buffer))
-      (should (string-match-p "Native compile failed" captured)))))
+  (let (captured)
+    (cl-letf (((symbol-function 'native-compile)
+               (lambda (_) (error "boom")))
+              ((symbol-function 'message)
+               (lambda (fmt &rest args) (setq captured (apply #'format fmt args)))))
+      (cj/--compile-elisp-file
+       "/tmp/some.el"
+       (test-config-utilities--available 'native-compile 'byte-compile-file)))
+    (should (string-match-p "Native compile failed" captured))))
+
+(ert-deftest test-config-utilities-compile-buffer-default-predicate-is-fboundp ()
+  "Normal: with no predicate the helper consults `fboundp', so on a real
+Emacs it reaches whichever compiler exists rather than the no-compiler
+message."
+  (let (captured)
+    (cl-letf (((symbol-function 'native-compile-async) (lambda (&rest _) nil))
+              ((symbol-function 'message)
+               (lambda (fmt &rest args) (setq captured (apply #'format fmt args)))))
+      (cj/--compile-elisp-file "/tmp/some.el"))
+    (should (string-match-p "Queued native compilation" captured))))
 
 (provide 'test-config-utilities--compile-this-elisp-buffer)
 ;;; test-config-utilities--compile-this-elisp-buffer.el ends here
diff --git a/tests/test-integration-recurring-events.el b/tests/test-integration-recurring-events.el
index 8339d167..44ddfb00 100644
--- a/tests/test-integration-recurring-events.el
+++ b/tests/test-integration-recurring-events.el
@@ -24,13 +24,22 @@
 
 ;;; Setup and Teardown
 
+(defvar test-integration-recurring-events--saved-tz nil
+  "The TZ in force before setup pinned it, restored by teardown.")
+
 (defun test-integration-recurring-events-setup ()
-  "Setup for recurring events integration tests."
-  nil)
+  "Setup for recurring events integration tests.
+Pins TZ to America/Chicago: the fixtures are TZID=America/Chicago and the
+assertions expect that zone's local rendering (\"Sat 10:30-11:00\"), so on
+any other machine zone the pipeline's correct conversion reads as a failure.
+`setenv' on TZ also calls `set-time-zone-rule', which is what the time
+functions actually consult."
+  (setq test-integration-recurring-events--saved-tz (getenv "TZ"))
+  (setenv "TZ" "America/Chicago"))
 
 (defun test-integration-recurring-events-teardown ()
-  "Teardown for recurring events integration tests."
-  nil)
+  "Teardown for recurring events integration tests: restore the machine TZ."
+  (setenv "TZ" test-integration-recurring-events--saved-tz))
 
 ;;; Test Data
 
diff --git a/tests/test-prog-general-yas-activation.el b/tests/test-prog-general-yas-activation.el
index d6ea42cd..d9ae76e3 100644
--- a/tests/test-prog-general-yas-activation.el
+++ b/tests/test-prog-general-yas-activation.el
@@ -122,7 +122,11 @@ produces the marker block."
   "Boundary: <cj + expand in python-ts-mode (a tree-sitter prog-mode-derived
 mode) produces the marker block.  Verifies the snippet reaches modern
 tree-sitter modes through fundamental-mode inheritance."
-  (skip-unless (fboundp 'python-ts-mode))
+  ;; `python-ts-mode' prompts to install a missing grammar, which a batch run
+  ;; cannot answer, so skip on the grammar rather than on the mode's existence.
+  (skip-unless (and (fboundp 'python-ts-mode)
+                    (require 'treesit nil t)
+                    (treesit-ready-p 'python t)))
   (should (string= (test-prog-general--expand-cj-in-mode #'python-ts-mode)
                    test-prog-general--cj-expected)))
 
diff --git a/tests/test-system-defaults-functions.el b/tests/test-system-defaults-functions.el
index 4b647166..09bf9f2a 100644
--- a/tests/test-system-defaults-functions.el
+++ b/tests/test-system-defaults-functions.el
@@ -55,6 +55,12 @@
 ;; so it doesn't leak into a shared batch session.  `make test-name' loads
 ;; every test file into one Emacs; a leaked cwd there breaks the relative
 ;; loads of every file that follows.
+;; Declared special before the `let' below binds it: this file is lexical,
+;; so without the defvar the binding is a lexical local, and use-package's
+;; own `defcustom' then fails with "Defining as dynamic an already lexical
+;; var" (fatal at load since 31.1 moved the defcustom to autoload time).
+(defvar use-package-always-ensure)
+
 (let ((default-directory default-directory)
       (use-package-always-ensure nil))
   (cl-letf (((symbol-function 'server-running-p) (lambda (&rest _) t))