diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 18 | ||||
| -rw-r--r-- | nixos/lib/test-driver/test-driver.py | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 1c0aaca8ae2..64a56d9197f 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -75,6 +75,24 @@ services.xserver.displayManager.defaultSession = "xfce+icewm"; </programlisting> </para> </listitem> + <listitem> + <para> + The testing driver implementation in NixOS is now in Python <filename>make-test-python.nix</filename>. + This was done by Jacek Galowicz (<link xlink:href="https://github.com/tfc">@tfc</link>), and with the + collaboration of Julian Stecklina (<link xlink:href="https://github.com/blitz">@blitz</link>) and + Jana Traue (<link xlink:href="https://github.com/jtraue">@jtraue</link>). All documentation has been updated to use this + testing driver, and a vast majority of the 286 tests in NixOS were ported to python driver. In 20.09 the Perl driver implementation, + <filename>make-test.nix</filename>, is slated for removal. This should give users of the NixOS integration framework + a transitory period to rewrite their tests to use the Python implementation. Users of the Perl driver will see + this warning everytime they use it: +<screen> +<prompt>$ </prompt>warning: Perl VM tests are deprecated and will be removed for 20.09. +Please update your tests to use the python test driver. +See https://github.com/NixOS/nixpkgs/pull/71684 for details. +</screen> + API compatibility is planned to be kept for at least the next release with the perl driver. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 744fadb1a4f..07f27515990 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -387,7 +387,7 @@ class Machine: if state != require_state: raise Exception( "Expected unit ‘{}’ to to be in state ".format(unit) - + "'active' but it is in state ‘{}’".format(state) + + "'{}' but it is in state ‘{}’".format(require_state, state) ) def execute(self, command: str) -> Tuple[int, str]: |