diff options
| author | Jacek Galowicz <jacek@galowicz.de> | 2021-10-07 14:37:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 14:37:01 +0200 |
| commit | d68f1e43dfb9a8f4a1f3d42e55faffc986a80478 (patch) | |
| tree | 149b51a490e19feee334fb5f417d3fea36f1ae55 /nixos/lib/testing-python.nix | |
| parent | 708694e0813499346bb3b01abccd9d943e63d5b8 (diff) | |
| parent | 5c666cdf62615442cab413121384588c6ecebef5 (diff) | |
Merge pull request #126713 from blaggacao/nixos-test-ref/05-class-ify-test-driver
nixos test ref/05 class ify test driver
Diffstat (limited to 'nixos/lib/testing-python.nix')
| -rw-r--r-- | nixos/lib/testing-python.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index a1c3624d14995..dbba9e4c44526 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -43,7 +43,8 @@ rec { from pydoc import importfile with open('driver-symbols', 'w') as fp: t = importfile('${testDriverScript}') - test_symbols = t._test_symbols() + d = t.Driver([],[],"") + test_symbols = d.test_symbols() fp.write(','.join(test_symbols.keys())) EOF ''; @@ -188,14 +189,6 @@ rec { --set startScripts "''${vmStartScripts[*]}" \ --set testScript "$out/test-script" \ --set vlans '${toString vlans}' - - ${lib.optionalString (testScript == "") '' - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms - wrapProgram $out/bin/nixos-run-vms \ - --set startScripts "''${vmStartScripts[*]}" \ - --set testScript "${pkgs.writeText "start-all" "start_all(); join_all();"}" \ - --set vlans '${toString vlans}' - ''} ''); # Make a full-blown test |