Support more tests than just startup

It looks like I will need tests that some of the more interesting
packages actually work, not just build.
This commit is contained in:
Marien Zwart 2024-05-25 21:48:33 +10:00
parent 4597bb574e
commit 80a951826e
No known key found for this signature in database
3 changed files with 29 additions and 26 deletions

View file

@ -14,15 +14,19 @@
{ {
emacs29, emacs29,
lib,
linkFarm,
runCommand, runCommand,
testers, testers,
tmux, tmux,
writeText, writeText,
writeTextDir, writeTextDir,
makeDoomPackages, makeDoomPackages,
toInit, toInit,
}: }:
let let
inherit (lib.generators) toPretty;
common = { common = {
# TODO: drop after NixOS 24.05 release. # TODO: drop after NixOS 24.05 release.
emacs = emacs29; emacs = emacs29;
@ -31,12 +35,19 @@ let
mkDoom = args: (makeDoomPackages (common // args)).doomEmacs; mkDoom = args: (makeDoomPackages (common // args)).doomEmacs;
mkDoomDir = args: writeTextDir "init.el" (toInit args); mkDoomDir = args: writeTextDir "init.el" (toInit args);
minimalDoomDir = mkDoomDir { config = [ "default" ]; }; minimalDoomDir = mkDoomDir { config = [ "default" ]; };
doomTest = assertion: args: testers.testEqualContents { doomTest = name: init: doomArgs: testers.testEqualContents {
inherit assertion; assertion = "name = ${name}; modules = ${toPretty {} init}; args = ${toPretty {} doomArgs};";
expected = writeText "doom-expected" "Doom functions"; expected = writeText "doom-expected" "Doom functions";
# Runs Doom in tmux, waiting (by polling) until its window disappears. # Runs Doom in tmux, waiting (by polling) until its window disappears.
actual = runCommand "interactive" { actual = runCommand "interactive" {
nativeBuildInputs = [ tmux (mkDoom args) ]; # Read by tests.el.
testName = name;
nativeBuildInputs = [ tmux (mkDoom (doomArgs // {
doomDir = linkFarm "test-doomdir" {
"config.el" = ./tests.el;
"init.el" = writeText "init.el" (toInit init);
};
})) ];
} '' } ''
tmux new-session -s doom-testing -d tmux new-session -s doom-testing -d
tmux new-window -n doom-window doom-emacs tmux new-window -n doom-window doom-emacs
@ -61,9 +72,6 @@ in {
doomDir = ./doomdirs/example; doomDir = ./doomdirs/example;
profileName = ""; profileName = "";
}; };
interactive = doomTest "minimal doom starts" { doomDir = ./doomdirs/test; }; interactive = doomTest "minimal" { config = [ "default" ]; } { };
interactive-without-loader = doomTest "minimal doom (without loader) starts" { interactive-without-loader = doomTest "minimal" { config = [ "default" ]; } { profileName = ""; };
doomDir = ./doomdirs/test;
profileName = "";
};
} }

View file

@ -1,16 +0,0 @@
;; Copyright 2024 Google LLC
;;
;; Licensed under the Apache License, Version 2.0 (the "License");
;; you may not use this file except in compliance with the License.
;; You may obtain a copy of the License at
;;
;; http://www.apache.org/licenses/LICENSE-2.0
;;
;; Unless required by applicable law or agreed to in writing, software
;; distributed under the License is distributed on an "AS IS" BASIS,
;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
;; See the License for the specific language governing permissions and
;; limitations under the License.
;; Doom doesn't like a completely empty doom! block.
(doom! :config default)

View file

@ -19,9 +19,20 @@
;; This tries to hook into startup as late as possible, write a sign of life ;; This tries to hook into startup as late as possible, write a sign of life
;; (currently a string written to $out), and then exits. ;; (currently a string written to $out), and then exits.
(defun test-minimal ()
;; The minimal test is a noop.
)
(defun test-doom () (defun test-doom ()
(let ((out (getenv "out"))) (let* ((out (getenv "out"))
(write-region "Doom functions" nil out nil nil nil 'mustbenew)) (test (intern-soft (format "test-%s" (getenv "testName"))))
(result (condition-case err
(funcall test)
(error
(format "%s failed: %s" test err))
(:success
"Doom functions"))))
(write-region result nil out nil nil nil 'mustbenew))
(kill-emacs)) (kill-emacs))
(add-hook 'doom-after-init-hook 'test-doom) (add-hook 'doom-after-init-hook 'test-doom)