dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #156697 from marijanp/fix-146169

Browse Source
This commit is contained in:
Patrick Hilhorst 2022-01-26 20:24:57 +01:00 committed by GitHub
commit 2774f31f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/doc/manual/development/running-nixos-tests-interactively.section.md
View File

@ -5,7 +5,7 @@ when developing or debugging a test:
```ShellSession ```ShellSession
$ nix-build . -A nixosTests.login.driverInteractive $ nix-build . -A nixosTests.login.driverInteractive
$ ./result/bin/nixos-test-driver --interactive $ ./result/bin/nixos-test-driver
[...] [...]
>>> >>>
``` ```
@ -28,7 +28,7 @@ You can re-use the VM states coming from a previous run by setting the
`--keep-vm-state` flag. `--keep-vm-state` flag.
```ShellSession ```ShellSession
$ ./result/bin/nixos-test-driver --interactive --keep-vm-state $ ./result/bin/nixos-test-driver --keep-vm-state
``` ```
The machine state is stored in the `$TMPDIR/vm-state-machinename` The machine state is stored in the `$TMPDIR/vm-state-machinename`

4
nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml
View File

@ -6,7 +6,7 @@
</para> </para>
<programlisting> <programlisting>
$ nix-build . -A nixosTests.login.driverInteractive $ nix-build . -A nixosTests.login.driverInteractive
$ ./result/bin/nixos-test-driver --interactive $ ./result/bin/nixos-test-driver
[...] [...]
&gt;&gt;&gt; &gt;&gt;&gt;
</programlisting> </programlisting>
@ -30,7 +30,7 @@ $ ./result/bin/nixos-test-driver --interactive
the <literal>--keep-vm-state</literal> flag. the <literal>--keep-vm-state</literal> flag.
</para> </para>
<programlisting> <programlisting>
$ ./result/bin/nixos-test-driver --interactive --keep-vm-state $ ./result/bin/nixos-test-driver --keep-vm-state
</programlisting> </programlisting>
<para> <para>
The machine state is stored in the The machine state is stored in the

2
nixos/lib/test-driver/test_driver/__init__.py
View File

@ -61,7 +61,7 @@ def main() -> None:
"-I", "-I",
"--interactive", "--interactive",
help="drop into a python repl and run the tests interactively", help="drop into a python repl and run the tests interactively",
action="store_true", action=argparse.BooleanOptionalAction,
) )
arg_parser.add_argument( arg_parser.add_argument(
"--start-scripts", "--start-scripts",

5
nixos/lib/testing-python.nix
View File

@ -51,6 +51,7 @@ rec {
, enableOCR ? false , enableOCR ? false
, skipLint ? false , skipLint ? false
, passthru ? {} , passthru ? {}
, interactive ? false
}: }:
let let
# Reifies and correctly wraps the python test driver for # Reifies and correctly wraps the python test driver for
@ -139,7 +140,8 @@ rec {
wrapProgram $out/bin/nixos-test-driver \ wrapProgram $out/bin/nixos-test-driver \
--set startScripts "''${vmStartScripts[*]}" \ --set startScripts "''${vmStartScripts[*]}" \
--set testScript "$out/test-script" \ --set testScript "$out/test-script" \
--set vlans '${toString vlans}' --set vlans '${toString vlans}' \
${lib.optionalString (interactive) "--add-flags --interactive"}
''); '');
# Make a full-blown test # Make a full-blown test
@ -217,6 +219,7 @@ rec {
testName = name; testName = name;
qemu_pkg = pkgs.qemu; qemu_pkg = pkgs.qemu;
nodes = nodes pkgs.qemu; nodes = nodes pkgs.qemu;
interactive = true;
}; };
test = test =