diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-11 06:01:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 06:01:03 +0000 |
| commit | f0e180170d41b81f8c5cbb8b70a5b973e1000b4e (patch) | |
| tree | c24d40389b686256ad5fbe1e2f175e15d435084f /nixos/tests | |
| parent | b199af176d9e43cc2b550b85fdbdb6c887bad6f6 (diff) | |
| parent | 0acf0ce9243c76b23676cc3ff3ff0c9a78b6427e (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/boot.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index e8440598a822..9945a1dcd62f 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -36,7 +36,7 @@ let machine = create_machine(${machineConfig}) machine.start() machine.wait_for_unit("multi-user.target") - machine.succeed("nix verify -r --no-trust /run/current-system") + machine.succeed("nix store verify --no-trust -r --option experimental-features nix-command /run/current-system") with subtest("Check whether the channel got installed correctly"): machine.succeed("nix-instantiate --dry-run '<nixpkgs>' -A hello") diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 48f0f5934255..73dc676ca32d 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -184,11 +184,12 @@ let with subtest("Check whether nixos-rebuild works"): machine.succeed("nixos-rebuild switch >&2") - with subtest("Test nixos-option"): - kernel_modules = machine.succeed("nixos-option boot.initrd.kernelModules") - assert "virtio_console" in kernel_modules - assert "List of modules" in kernel_modules - assert "qemu-guest.nix" in kernel_modules + # FIXME: Nix 2.4 broke nixos-option, someone has to fix it. + # with subtest("Test nixos-option"): + # kernel_modules = machine.succeed("nixos-option boot.initrd.kernelModules") + # assert "virtio_console" in kernel_modules + # assert "List of modules" in kernel_modules + # assert "qemu-guest.nix" in kernel_modules machine.shutdown() |