movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixosTests.emacs-daemon: migrate to runTest

Browse source 
Part of NixOS#386873
This commit is contained in:
Piotr Kwiecinski 2025-03-28 14:40:52 +01:00
parent 667e8fbf2c
commit 71d746b1fd
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 38 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -360,7 +360,7 @@ in {
eintopf = handleTest ./eintopf.nix {};
ejabberd = handleTest ./xmpp/ejabberd.nix {};
elk = handleTestOn ["x86_64-linux"] ./elk.nix {};
emacs-daemon = handleTest ./emacs-daemon.nix {};
emacs-daemon = runTest ./emacs-daemon.nix;
endlessh = handleTest ./endlessh.nix {};
endlessh-go = handleTest ./endlessh-go.nix {};
engelsystem = handleTest ./engelsystem.nix {};

78
nixos/tests/emacs-daemon.nix
View file

@ -1,52 +1,48 @@
import ./make-test-python.nix (
{ pkgs, ... }:
{
name = "emacs-daemon";
meta = with pkgs.lib.maintainers; {
maintainers = [ ];
};
{ lib, ... }:
{
name = "emacs-daemon";
meta.maintainers = lib.teams.emacs.members;
enableOCR = true;
enableOCR = true;
nodes.machine =
{ ... }:
nodes.machine =
{ ... }:
{
imports = [ ./common/x11.nix ];
services.emacs = {
enable = true;
defaultEditor = true;
};
# Important to get the systemd service running for root
environment.variables.XDG_RUNTIME_DIR = "/run/user/0";
environment.variables.TEST_SYSTEM_VARIABLE = "system variable";
{
imports = [ ./common/x11.nix ];
services.emacs = {
enable = true;
defaultEditor = true;
};
testScript = ''
machine.wait_for_unit("multi-user.target")
# Important to get the systemd service running for root
environment.variables.XDG_RUNTIME_DIR = "/run/user/0";
# checks that the EDITOR environment variable is set
machine.succeed('test $(basename "$EDITOR") = emacseditor')
environment.variables.TEST_SYSTEM_VARIABLE = "system variable";
};
# waits for the emacs service to be ready
machine.wait_until_succeeds(
"systemctl --user status emacs.service | grep 'Active: active'"
)
testScript = ''
machine.wait_for_unit("multi-user.target")
# connects to the daemon
machine.succeed("emacsclient --no-wait --frame-parameters='((display . \"'\"$DISPLAY\"'\"))' --create-frame $EDITOR >&2")
# checks that the EDITOR environment variable is set
machine.succeed('test $(basename "$EDITOR") = emacseditor')
# checks that Emacs shows the edited filename
machine.wait_for_text("emacseditor")
# waits for the emacs service to be ready
machine.wait_until_succeeds(
"systemctl --user status emacs.service | grep 'Active: active'"
)
# makes sure environment variables are accessible from Emacs
machine.succeed(
"emacsclient --eval '(getenv \"TEST_SYSTEM_VARIABLE\")' | grep -q 'system variable'"
)
# connects to the daemon
machine.succeed("emacsclient --no-wait --frame-parameters='((display . \"'\"$DISPLAY\"'\"))' --create-frame $EDITOR >&2")
machine.screenshot("emacsclient")
'';
}
)
# checks that Emacs shows the edited filename
machine.wait_for_text("emacseditor")
# makes sure environment variables are accessible from Emacs
machine.succeed(
"emacsclient --eval '(getenv \"TEST_SYSTEM_VARIABLE\")' | grep -q 'system variable'"
)
machine.screenshot("emacsclient")
'';
}