diff options
| author | Jacek Galowicz <jacek@galowicz.de> | 2021-10-07 14:37:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 14:37:01 +0200 |
| commit | d68f1e43dfb9a8f4a1f3d42e55faffc986a80478 (patch) | |
| tree | 149b51a490e19feee334fb5f417d3fea36f1ae55 /nixos/modules/installer | |
| parent | 708694e0813499346bb3b01abccd9d943e63d5b8 (diff) | |
| parent | 5c666cdf62615442cab413121384588c6ecebef5 (diff) | |
| download | nixpkgs-d68f1e43dfb9a8f4a1f3d42e55faffc986a80478.tar nixpkgs-d68f1e43dfb9a8f4a1f3d42e55faffc986a80478.tar.gz nixpkgs-d68f1e43dfb9a8f4a1f3d42e55faffc986a80478.tar.bz2 nixpkgs-d68f1e43dfb9a8f4a1f3d42e55faffc986a80478.tar.lz nixpkgs-d68f1e43dfb9a8f4a1f3d42e55faffc986a80478.tar.xz nixpkgs-d68f1e43dfb9a8f4a1f3d42e55faffc986a80478.tar.zst nixpkgs-d68f1e43dfb9a8f4a1f3d42e55faffc986a80478.zip | |
Merge pull request #126713 from blaggacao/nixos-test-ref/05-class-ify-test-driver
nixos test ref/05 class ify test driver
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-build-vms/build-vms.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix index e49ceba2424..8aedce2fb49 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix @@ -8,11 +8,21 @@ let _file = "${networkExpr}@node-${vm}"; imports = [ module ]; }) (import networkExpr); -in -with import ../../../../lib/testing-python.nix { - inherit system; pkgs = import ../../../../.. { inherit system config; }; -}; -(makeTest { inherit nodes; testScript = ""; }).driverInteractive + testing = import ../../../../lib/testing-python.nix { + inherit system pkgs; + }; + + interactiveDriver = (testing.makeTest { inherit nodes; testScript = "start_all(); join_all();"; }).driverInteractive; +in + + +pkgs.runCommand "nixos-build-vms" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' + mkdir -p $out/bin + ln -s ${interactiveDriver}/bin/nixos-test-driver $out/bin/nixos-test-driver + ln -s ${interactiveDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms + wrapProgram $out/bin/nixos-test-driver \ + --add-flags "--interactive" +'' |