diff options
| author | Jacek Galowicz <jacek@galowicz.de> | 2021-06-06 22:25:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-06 22:25:40 +0200 |
| commit | 114f9bccb527383bb4064ee88af3aa3530153246 (patch) | |
| tree | 7dc0b98cfaa085f7961584418df2bb0daecd34cb /nixos | |
| parent | dc8af36c452166046df5a30b668e79fbbee734c5 (diff) | |
| parent | 03bfa298913e752ff804697ec7f95fdac647b5c3 (diff) | |
| download | nixlib-114f9bccb527383bb4064ee88af3aa3530153246.tar nixlib-114f9bccb527383bb4064ee88af3aa3530153246.tar.gz nixlib-114f9bccb527383bb4064ee88af3aa3530153246.tar.bz2 nixlib-114f9bccb527383bb4064ee88af3aa3530153246.tar.lz nixlib-114f9bccb527383bb4064ee88af3aa3530153246.tar.xz nixlib-114f9bccb527383bb4064ee88af3aa3530153246.tar.zst nixlib-114f9bccb527383bb4064ee88af3aa3530153246.zip | |
Merge pull request #125971 from blaggacao/nixos-test-ref/rem-dead-code
nixos/tests/test-driver: cleanup "dead" code
Diffstat (limited to 'nixos')
| -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 ab739ce3222f..9c97ce383437 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 99d0a9a0bfaf..715482e87304 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) { |