diff options
author | Arian van Putten <aeroboy94@gmail.com> | 2019-05-26 00:52:52 +0200 |
---|---|---|
committer | Arian van Putten <aeroboy94@gmail.com> | 2019-05-29 12:50:49 +0200 |
commit | cbc45b5981f26c80e7d78e9525373b1388b7e516 (patch) | |
tree | 1a6afa5224b652882b22ef23c7c81c992dab0364 /nixos | |
parent | a48047a755047b34471a740dffa07744221d63c2 (diff) |
nixos: Make nesting.children work in NixOS tests
We differentiate between modules and baseModules in the VM builder for NixOS tests. This way, nesting.children, eventhough it doesn't inherit from parent, still has enough config to actually complete the test. Otherwise, the qemu modules would not be loaded, for example, and a nesting.children statement would not evaluate.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/lib/build-vms.nix | 6 | ||||
-rw-r--r-- | nixos/tests/nesting.nix | 46 |
2 files changed, 36 insertions, 16 deletions
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index ba8e13b431a04..6c92aa1ffa2f7 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -32,14 +32,14 @@ rec { import ./eval-config.nix { inherit system; - modules = configurations ++ + modules = configurations ++ extraConfigurations; + baseModules = (import ../modules/module-list.nix) ++ [ ../modules/virtualisation/qemu-vm.nix ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs { key = "no-manual"; documentation.nixos.enable = false; } { key = "qemu"; system.build.qemu = qemu; } { key = "nodes"; _module.args.nodes = nodes; } - ] ++ optional minimal ../modules/testing/minimal-kernel.nix - ++ extraConfigurations; + ] ++ optional minimal ../modules/testing/minimal-kernel.nix; }; diff --git a/nixos/tests/nesting.nix b/nixos/tests/nesting.nix index 3be64d7a9b549..1306d6f8e0c55 100644 --- a/nixos/tests/nesting.nix +++ b/nixos/tests/nesting.nix @@ -1,22 +1,42 @@ import ./make-test.nix { name = "nesting"; - machine = { pkgs, ... }: { - environment.systemPackages = [ pkgs.cowsay ]; - nesting.clone = [ - ({ pkgs, ... }: { - environment.systemPackages = [ pkgs.hello ]; - }) - ]; + nodes = { + clone = { pkgs, ... }: { + environment.systemPackages = [ pkgs.cowsay ]; + nesting.clone = [ + ({ pkgs, ... }: { + environment.systemPackages = [ pkgs.hello ]; + }) + ]; + }; + children = { pkgs, ... }: { + environment.systemPackages = [ pkgs.cowsay ]; + nesting.children = [ + ({ pkgs, ... }: { + environment.systemPackages = [ pkgs.hello ]; + }) + ]; + }; }; testScript = '' - $machine->waitForUnit("default.target"); - $machine->succeed("cowsay hey"); - $machine->fail("hello"); + $clone->waitForUnit("default.target"); + $clone->succeed("cowsay hey"); + $clone->fail("hello"); # Nested clones do inherit from parent - $machine->succeed("/run/current-system/fine-tune/child-1/bin/switch-to-configuration test"); - $machine->succeed("cowsay hey"); - $machine->succeed("hello"); + $clone->succeed("/run/current-system/fine-tune/child-1/bin/switch-to-configuration test"); + $clone->succeed("cowsay hey"); + $clone->succeed("hello"); + + + $children->waitForUnit("default.target"); + $children->succeed("cowsay hey"); + $children->fail("hello"); + + # Nested children do not inherit from parent + $children->succeed("/run/current-system/fine-tune/child-1/bin/switch-to-configuration test"); + $children->fail("cowsay hey"); + $children->succeed("hello"); ''; } |