diff options
| author | David Arnold <dar@xoe.solutions> | 2021-06-06 12:07:02 -0500 |
|---|---|---|
| committer | David Arnold <dar@xoe.solutions> | 2021-06-06 12:58:58 -0500 |
| commit | 03bfa298913e752ff804697ec7f95fdac647b5c3 (patch) | |
| tree | 81c341e797d8ffc6d21309c0641045a5c13d64d7 /nixos/lib | |
| parent | 3e0d605d56fed5709fbf01fcc2ebc45de70bacf5 (diff) | |
| download | nixpkgs-03bfa298913e752ff804697ec7f95fdac647b5c3.tar nixpkgs-03bfa298913e752ff804697ec7f95fdac647b5c3.tar.gz nixpkgs-03bfa298913e752ff804697ec7f95fdac647b5c3.tar.bz2 nixpkgs-03bfa298913e752ff804697ec7f95fdac647b5c3.tar.lz nixpkgs-03bfa298913e752ff804697ec7f95fdac647b5c3.tar.xz nixpkgs-03bfa298913e752ff804697ec7f95fdac647b5c3.tar.zst nixpkgs-03bfa298913e752ff804697ec7f95fdac647b5c3.zip | |
nixos/tests/test-driver: cleanup "dead" code (USE_SERIAL)
At nixpkgs root: `rg redirectSerial ./` does not result in any other match nor does `rg USE_SERIAL ./` except for an unrelated match in: pkgs/tools/graphics/argyllcms/default.nix
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/test-driver/test-driver.py | 1 | ||||
| -rw-r--r-- | nixos/lib/testing-python.nix | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index ab739ce3222..9c97ce38343 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -907,7 +907,6 @@ class Machine: def create_machine(args: Dict[str, Any]) -> Machine: global log args["log"] = log - args["redirectSerial"] = os.environ.get("USE_SERIAL", "0") == "1" return Machine(args) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 99d0a9a0bfa..715482e8730 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -196,8 +196,7 @@ rec { --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --set tests 'start_all(); join_all();' \ - --set VLANS '${toString vlans}' \ - ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} + --set VLANS '${toString vlans}' ''); # " passMeta = drv: drv // lib.optionalAttrs (t ? meta) { |