git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #80099 from tfc/port-run-in-machine-test

nixosTests.run-in-machine: Port to Python

commitc4de30cce1220c7176a8b8f658ec17b1b2544268 authorworldofpeace <worldofpeace@protonmail.ch> dateTue 18 Feb 2020, 12:03 (7 years ago) parent72c1451965c178
2 files changed+2−2
nixos/lib/test-driver/test-driver.py+1−1 nixos/tests/run-in-machine.nix+1−1
nixos/lib/test-driver/test-driver.py+1−1
@@ -911,7 +911,7 @@ def subtest(name: str) -> Iterator[None]:
911911if __name__ == "__main__":
912912 log = Logger()
913913
914− vlan_nrs = list(dict.fromkeys(os.environ["VLANS"].split()))
914+ vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split()))
915915 vde_sockets = [create_vlan(v) for v in vlan_nrs]
916916 for nr, vde_socket, _, _ in vde_sockets:
917917 os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket
nixos/tests/run-in-machine.nix+1−1
@@ -3,7 +3,7 @@
33 pkgs ? import ../.. { inherit system config; }
44}:
55
6−with import ../lib/testing.nix { inherit system pkgs; };
6+with import ../lib/testing-python.nix { inherit system pkgs; };
77
88let
99 output = runInMachine {