diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-01-07 02:33:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-07 02:33:21 +0100 |
commit | 6249d324863ccb7b6a40d2b759e9a996fcdcd85f (patch) | |
tree | 2df363252c9156160921b04abfaf420721dfd554 /nixos | |
parent | d3ad52a58eb3e4513f962eb059918579d6813a39 (diff) | |
parent | e18b0b6033eb17c1aec48d931900f5debae9f4ef (diff) |
Merge pull request #33418 from Ma27/test-driver/mention-changes-in-manual
test-driver: mention `$user` argument in the NixOS manual and the Impala release notes
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/development/writing-nixos-tests.xml | 29 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1803.xml | 7 |
2 files changed, 36 insertions, 0 deletions
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 7b25a39e83b82..a8f6aa00858e3 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -272,8 +272,37 @@ startAll; </listitem> </varlistentry> + <varlistentry> + <term><methodname>systemctl</methodname></term> + <listitem> + <para>Runs <literal>systemctl</literal> commands with optional support for + <literal>systemctl --user</literal></para> + <para> + <programlisting> + $machine->systemctl("list-jobs --no-pager"); // runs `systemctl list-jobs --no-pager` + $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` + </programlisting> + </para> + </listitem> + </varlistentry> + </variablelist> </para> +<para> + To test user units declared by <literal>systemd.user.services</literal> the optional <literal>$user</literal> + argument can be used: + + <programlisting> + $machine->start; + $machine->waitForX; + $machine->waitForUnit("xautolock.service", "x-session-user"); + </programlisting> + + This applies to <literal>systemctl</literal>, <literal>getUnitInfo</literal>, + <literal>waitForUnit</literal>, <literal>startJob</literal> + and <literal>stopJob</literal>. +</para> + </section> diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index c8549e7c4adca..12ff2e39a1bf5 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -234,6 +234,13 @@ following incompatible changes:</para> to your <literal>configuration.nix</literal>. </para> </listitem> + <listitem> + <para> + The NixOS test driver supports user services declared by <literal>systemd.user.services</literal>. + The methods <literal>waitForUnit</literal>, <literal>getUnitInfo</literal>, <literal>startJob</literal> + and <literal>stopJob</literal> provide an optional <literal>$user</literal> argument for that purpose. + </para> + </listitem> </itemizedlist> </section> |