diff options
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/all-tests.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/kexec.nix | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0ee91ebffbed..c85644e150af 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -218,6 +218,7 @@ in kerberos = handleTest ./kerberos/default.nix {}; kernel-generic = handleTest ./kernel-generic.nix {}; kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {}; + kexec = handleTest ./kexec.nix {}; keycloak = discoverTests (import ./keycloak.nix); keymap = handleTest ./keymap.nix {}; knot = handleTest ./knot.nix {}; diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index b0d072167fad..010f3da49846 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -4,12 +4,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "kexec"; meta = with lib.maintainers; { maintainers = [ eelco ]; - # Currently hangs forever; last output is: - # machine # [ 10.239914] dhcpcd[707]: eth0: adding default route via fe80::2 - # machine: waiting for the VM to finish booting - # machine # Cannot find the ESP partition mount point. - # machine # [ 28.681197] nscd[692]: 692 checking for monitored file `/etc/netgroup': No such file or directory - broken = true; }; machine = { ... }: @@ -18,8 +12,11 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { testScript = '' machine.wait_for_unit("multi-user.target") + machine.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(</proc/cmdline)"') machine.execute("systemctl kexec >&2 &", check_return=False) machine.connected = False + machine.connect() machine.wait_for_unit("multi-user.target") + machine.shutdown() ''; }) |