diff options
author | lewo <lewo@abesis.fr> | 2021-08-08 10:24:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-08 10:24:47 +0200 |
commit | 7aa78642c5f2be070c92b6f2d8762ef1390234cb (patch) | |
tree | 20870ea48fa01e829fa1467a22cb0c4909e5d70e /nixos/lib/testing-python.nix | |
parent | 3a3f82631fa60bece8a7d499eee29e522c770fd8 (diff) | |
parent | 926fb9396881202e727e5ec1fbf609b64455b388 (diff) | |
download | nixpkgs-7aa78642c5f2be070c92b6f2d8762ef1390234cb.tar nixpkgs-7aa78642c5f2be070c92b6f2d8762ef1390234cb.tar.gz nixpkgs-7aa78642c5f2be070c92b6f2d8762ef1390234cb.tar.bz2 nixpkgs-7aa78642c5f2be070c92b6f2d8762ef1390234cb.tar.lz nixpkgs-7aa78642c5f2be070c92b6f2d8762ef1390234cb.tar.xz nixpkgs-7aa78642c5f2be070c92b6f2d8762ef1390234cb.tar.zst nixpkgs-7aa78642c5f2be070c92b6f2d8762ef1390234cb.zip |
Merge pull request #125979 from blaggacao/nixos-test-ref/03-normalse-the-python-entrypoint
nixos/test-driver: normalize the python entrypoint
Diffstat (limited to 'nixos/lib/testing-python.nix')
-rw-r--r-- | nixos/lib/testing-python.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index c703484666d..6369d6ef05d 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -83,7 +83,10 @@ rec { '' mkdir -p $out - LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver + # effectively mute the XMLLogger + export LOGFILE=/dev/null + + ${driver}/bin/nixos-test-driver ''; passthru = driver.passthru // { @@ -166,7 +169,10 @@ rec { '' mkdir -p $out/bin + vmStartScripts=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) echo -n "$testScript" > $out/test-script + ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-test-driver + ${lib.optionalString (!skipLint) '' PYFLAKES_BUILTINS="$( echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)}, @@ -174,17 +180,12 @@ rec { )" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script ''} - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ - vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) + # set defaults through environment + # see: ./test-driver/test-driver.py argparse implementation wrapProgram $out/bin/nixos-test-driver \ - --add-flags "''${vms[*]}" \ - --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \ - --set VLANS '${toString vlans}' - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms - wrapProgram $out/bin/nixos-run-vms \ - --add-flags "''${vms[*]}" \ - --set tests 'start_all(); join_all();' \ - --set VLANS '${toString vlans}' + --set startScripts "''${vmStartScripts[*]}" \ + --set testScript "$out/test-script" \ + --set vlans '${toString vlans}' ''); # Make a full-blown test |