diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-10-19 17:20:27 +0200 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2020-10-19 17:39:48 +0200 |
| commit | 20893b3a700a5818aa4769b1c00c1a99c171af02 (patch) | |
| tree | 361fce9c8c883daa86ebe03eb152b73b4633fe57 /nixos | |
| parent | c096880d46115c43ea254efc52de32dc3fe58913 (diff) | |
nixos/tests: expose both the interactive and non-interactive driver
For a lot of the work the non-interactive drivers are enough and it is
probably a good idea to keep it accessible for debugging without
touching the Nix expression.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/development/running-nixos-tests-interactively.xml | 4 | ||||
| -rw-r--r-- | nixos/lib/testing-python.nix | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml index a11a9382764d..a6044d5f89e8 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -9,7 +9,7 @@ The test itself can be run interactively. This is particularly useful when developing or debugging a test: <screen> -<prompt>$ </prompt>nix-build nixos/tests/login.nix -A driver +<prompt>$ </prompt>nix-build nixos/tests/login.nix -A driverInteractive <prompt>$ </prompt>./result/bin/nixos-test-driver starting VDE switch for network 1 <prompt>></prompt> @@ -30,7 +30,7 @@ starting VDE switch for network 1 <para> To just start and experiment with the VMs, run: <screen> -<prompt>$ </prompt>nix-build nixos/tests/login.nix -A driver +<prompt>$ </prompt>nix-build nixos/tests/login.nix -A driverInteractive <prompt>$ </prompt>./result/bin/nixos-run-vms </screen> The script <command>nixos-run-vms</command> starts the virtual machines diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 69cad8cdceb1..302c7f78bf8e 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -172,7 +172,8 @@ rec { else test // { inherit nodes test; - driver = driver testDriverInteractive; + driver = driver testDriver; + driverInteractive = driver testDriverInteractive; }; runInMachine = |