diff options
| author | Erik Arvstedt <erik.arvstedt@gmail.com> | 2018-11-26 19:36:02 +0100 |
|---|---|---|
| committer | Erik Arvstedt <erik.arvstedt@gmail.com> | 2018-11-26 19:36:50 +0100 |
| commit | 931b7b47a279b7e566ef487ee1bc1a8002bd1212 (patch) | |
| tree | 09e561b3a3c6b5312c1f51e99ea97921e2f26d3a /nixos/doc/manual/development | |
| parent | 128a446c59872f1df38070655a903b885293b995 (diff) | |
| download | nixlib-931b7b47a279b7e566ef487ee1bc1a8002bd1212.tar nixlib-931b7b47a279b7e566ef487ee1bc1a8002bd1212.tar.gz nixlib-931b7b47a279b7e566ef487ee1bc1a8002bd1212.tar.bz2 nixlib-931b7b47a279b7e566ef487ee1bc1a8002bd1212.tar.lz nixlib-931b7b47a279b7e566ef487ee1bc1a8002bd1212.tar.xz nixlib-931b7b47a279b7e566ef487ee1bc1a8002bd1212.tar.zst nixlib-931b7b47a279b7e566ef487ee1bc1a8002bd1212.zip | |
nixos tests doc: minor fixes
This fixes some quirks I introduced in previous commits. 1. No need for an extra newline when printing the output of shell commands. 2. 'or die' is what's already used in the NixOS test sources, while 'die unless' has no occurrences.
Diffstat (limited to 'nixos/doc/manual/development')
| -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> |