nixosTests.zsh-history: migrate to runTest

Part Of #386873
This commit is contained in:
Martin Weinelt 2025-03-14 22:41:04 +01:00
parent 16cf246490
commit 04bc28c680
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 34 additions and 36 deletions

View file

@ -1319,7 +1319,7 @@ in {
zookeeper = handleTest ./zookeeper.nix {}; zookeeper = handleTest ./zookeeper.nix {};
zram-generator = handleTest ./zram-generator.nix {}; zram-generator = handleTest ./zram-generator.nix {};
zrepl = handleTest ./zrepl.nix {}; zrepl = handleTest ./zrepl.nix {};
zsh-history = handleTest ./zsh-history.nix {}; zsh-history = runTest ./zsh-history.nix;
zwave-js = runTest ./zwave-js.nix; zwave-js = runTest ./zwave-js.nix;
zwave-js-ui = runTest ./zwave-js-ui.nix; zwave-js-ui = runTest ./zwave-js-ui.nix;
} }

View file

@ -1,40 +1,38 @@
import ./make-test-python.nix ( { pkgs, ... }:
{ pkgs, ... }: {
{ name = "zsh-history";
name = "zsh-history"; meta = with pkgs.lib.maintainers; {
meta = with pkgs.lib.maintainers; { maintainers = [ ];
maintainers = [ ]; };
nodes.default =
{ ... }:
{
programs = {
zsh.enable = true;
};
environment.systemPackages = [ pkgs.zsh-history ];
programs.zsh.interactiveShellInit = ''
source ${pkgs.zsh-history.out}/share/zsh/init.zsh
'';
users.users.root.shell = "${pkgs.zsh}/bin/zsh";
}; };
nodes.default = testScript = ''
{ ... }: start_all()
{ default.wait_for_unit("multi-user.target")
programs = { default.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
zsh.enable = true;
};
environment.systemPackages = [ pkgs.zsh-history ];
programs.zsh.interactiveShellInit = ''
source ${pkgs.zsh-history.out}/share/zsh/init.zsh
'';
users.users.root.shell = "${pkgs.zsh}/bin/zsh";
};
testScript = '' # Login
start_all() default.wait_until_tty_matches("1", "login: ")
default.wait_for_unit("multi-user.target") default.send_chars("root\n")
default.wait_until_succeeds("pgrep -f 'agetty.*tty1'") default.wait_until_tty_matches("1", r"\nroot@default\b")
# Login # Generate some history
default.wait_until_tty_matches("1", "login: ") default.send_chars("echo foobar\n")
default.send_chars("root\n") default.wait_until_tty_matches("1", "foobar")
default.wait_until_tty_matches("1", r"\nroot@default\b")
# Generate some history # Ensure that command was recorded in history
default.send_chars("echo foobar\n") default.succeed("/run/current-system/sw/bin/history list | grep -q foobar")
default.wait_until_tty_matches("1", "foobar") '';
}
# Ensure that command was recorded in history
default.succeed("/run/current-system/sw/bin/history list | grep -q foobar")
'';
}
)