nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-25 05:23:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #125971 from blaggacao/nixos-test-ref/rem-dead-code

Browse Source 
nixos/tests/test-driver: cleanup "dead" code
This commit is contained in:
Jacek Galowicz 2021-06-06 22:25:40 +02:00 committed by GitHub
commit 114f9bccb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/lib/test-driver/test-driver.py
View File

@ -907,7 +907,6 @@ class Machine:
def create_machine(args: Dict[str, Any]) -> Machine: def create_machine(args: Dict[str, Any]) -> Machine:
global log global log
args["log"] = log args["log"] = log
args["redirectSerial"] = os.environ.get("USE_SERIAL", "0") == "1"
return Machine(args) return Machine(args)

3
nixos/lib/testing-python.nix
View File

@ -196,8 +196,7 @@ rec {
--add-flags "''${vms[*]}" \ --add-flags "''${vms[*]}" \
${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
--set tests 'start_all(); join_all();' \ --set tests 'start_all(); join_all();' \
--set VLANS '${toString vlans}' \ --set VLANS '${toString vlans}'
${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
''); # " ''); # "
passMeta = drv: drv // lib.optionalAttrs (t ? meta) { passMeta = drv: drv // lib.optionalAttrs (t ? meta) {