diff options
| author | ajs124 <git@ajs124.de> | 2020-05-25 04:05:55 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-07-14 12:00:33 +0200 |
| commit | d056f6e86d39f803eacc8b70501cead76d58c069 (patch) | |
| tree | 86780804ef1294e888b90904b28ca938bb748988 /nixos/tests/installer.nix | |
| parent | e55ef86ebda5f21c17315be2950c1de5670ddc08 (diff) | |
| download | nixpkgs-d056f6e86d39f803eacc8b70501cead76d58c069.tar nixpkgs-d056f6e86d39f803eacc8b70501cead76d58c069.tar.gz nixpkgs-d056f6e86d39f803eacc8b70501cead76d58c069.tar.bz2 nixpkgs-d056f6e86d39f803eacc8b70501cead76d58c069.tar.lz nixpkgs-d056f6e86d39f803eacc8b70501cead76d58c069.tar.xz nixpkgs-d056f6e86d39f803eacc8b70501cead76d58c069.tar.zst nixpkgs-d056f6e86d39f803eacc8b70501cead76d58c069.zip | |
nixos/test/installer: add postBootCommands
Diffstat (limited to 'nixos/tests/installer.nix')
| -rw-r--r-- | nixos/tests/installer.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index eef9abebf9f..158a19925c2 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -64,7 +64,7 @@ let # a test script fragment `createPartitions', which must create # partitions and filesystems. testScriptFun = { bootLoader, createPartitions, grubVersion, grubDevice, grubUseEfi - , grubIdentifier, preBootCommands, extraConfig + , grubIdentifier, preBootCommands, postBootCommands, extraConfig , testSpecialisationConfig }: let iface = if grubVersion == 1 then "ide" else "virtio"; @@ -216,6 +216,7 @@ let machine = create_machine_named("boot-after-rebuild-switch") ${preBootCommands} machine.wait_for_unit("network.target") + ${postBootCommands} machine.shutdown() # Tests for validating clone configuration entries in grub menu @@ -238,6 +239,7 @@ let with subtest("Set grub to boot the second configuration"): machine.succeed("grub-reboot 1") + ${postBootCommands} machine.shutdown() # Reboot Machine @@ -252,12 +254,13 @@ let with subtest("We should find a file named /etc/gitconfig"): machine.succeed("test -e /etc/gitconfig") + ${postBootCommands} machine.shutdown() ''; makeInstallerTest = name: - { createPartitions, preBootCommands ? "", extraConfig ? "" + { createPartitions, preBootCommands ? "", postBootCommands ? "", extraConfig ? "" , extraInstallerConfig ? {} , bootLoader ? "grub" # either "grub" or "systemd-boot" , grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid", grubUseEfi ? false @@ -335,7 +338,7 @@ let }; testScript = testScriptFun { - inherit bootLoader createPartitions preBootCommands + inherit bootLoader createPartitions preBootCommands postBootCommands grubVersion grubDevice grubIdentifier grubUseEfi extraConfig testSpecialisationConfig; }; |