diff options
| author | David Arnold <dar@xoe.solutions> | 2021-06-12 17:47:25 -0500 |
|---|---|---|
| committer | David Arnold <david.arnold@iohk.io> | 2021-10-05 14:38:48 -0500 |
| commit | b0fc9da879812e47c1ed3438fb0fd51db00a3494 (patch) | |
| tree | c238d3e8ce9c6ad17c47e8414001a29e137d8e52 /nixos/lib/testing-python.nix | |
| parent | 3069ba0dd1dec75c5dc4f6a1ee238a4fab9828cd (diff) | |
nixos/test/test-driver: Class-ify the test driver
This commit encapsulates the involved domain into classes and defines explicit and typed arguments where untyped dicts where used. It preserves backwards compatibility through legacy wrappers.
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 43b4f9b159b2f..1969f40edb6b0 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 |