diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2018-11-28 20:34:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 20:34:53 +0100 |
| commit | 36994f8620a9999de3968ee35426d81bb491387c (patch) | |
| tree | 64c690ce238722501fcc44cbd5271fd959c2dfae /nixos/doc/manual | |
| parent | 1b4749ceefd254a2cced0b8aa0dd35afe3cee64e (diff) | |
| parent | 931b7b47a279b7e566ef487ee1bc1a8002bd1212 (diff) | |
| download | nixlib-36994f8620a9999de3968ee35426d81bb491387c.tar nixlib-36994f8620a9999de3968ee35426d81bb491387c.tar.gz nixlib-36994f8620a9999de3968ee35426d81bb491387c.tar.bz2 nixlib-36994f8620a9999de3968ee35426d81bb491387c.tar.lz nixlib-36994f8620a9999de3968ee35426d81bb491387c.tar.xz nixlib-36994f8620a9999de3968ee35426d81bb491387c.tar.zst nixlib-36994f8620a9999de3968ee35426d81bb491387c.zip | |
Merge pull request #51073 from erikarvstedt/docs
Minor doc fixes
Diffstat (limited to 'nixos/doc/manual')
| -rw-r--r-- | nixos/doc/manual/development/running-nixos-tests-interactively.xml | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/development/writing-nixos-tests.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml index b25d3dcb9116..c15ad448317f 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -19,7 +19,7 @@ starting VDE switch for network 1 > startAll > testScript > $machine->succeed("touch /tmp/foo") -> print($machine->succeed("pwd"), "\n") # Show stdout of command +> print($machine->succeed("pwd")) # Show stdout of command </screen> The function <command>testScript</command> executes the entire test script and drops you back into the test driver command line upon its completion. diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 983f8f9cbe3e..4a2615c9407b 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -108,7 +108,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualis <programlisting> $machine->start; $machine->waitForUnit("default.target"); -die unless $machine->succeed("uname") =~ /Linux/; +$machine->succeed("uname") =~ /Linux/ or die; </programlisting> The first line is actually unnecessary; machines are implicitly started when you first execute an action on them (such as <literal>waitForUnit</literal> |