diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-18 12:03:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 12:03:16 -0500 |
| commit | c4de30cce1220c7176a8b8f658ec17b1b2544268 (patch) | |
| tree | 1354738958915168ef2bf2b3886e7ba0c7cd75d5 /nixos | |
| parent | 72c145115b76b9e1eb77f0d374dd106c6da7475a (diff) | |
| parent | 965c1785d08a718f524e940d6ddf5593a644636a (diff) | |
| download | nixlib-c4de30cce1220c7176a8b8f658ec17b1b2544268.tar nixlib-c4de30cce1220c7176a8b8f658ec17b1b2544268.tar.gz nixlib-c4de30cce1220c7176a8b8f658ec17b1b2544268.tar.bz2 nixlib-c4de30cce1220c7176a8b8f658ec17b1b2544268.tar.lz nixlib-c4de30cce1220c7176a8b8f658ec17b1b2544268.tar.xz nixlib-c4de30cce1220c7176a8b8f658ec17b1b2544268.tar.zst nixlib-c4de30cce1220c7176a8b8f658ec17b1b2544268.zip | |
Merge pull request #80099 from tfc/port-run-in-machine-test
nixosTests.run-in-machine: Port to Python
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/test-driver/test-driver.py | 2 | ||||
| -rw-r--r-- | nixos/tests/run-in-machine.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 2b8dffec7d59..c27947bc610d 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -911,7 +911,7 @@ def subtest(name: str) -> Iterator[None]: if __name__ == "__main__": log = Logger() - vlan_nrs = list(dict.fromkeys(os.environ["VLANS"].split())) + vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split())) vde_sockets = [create_vlan(v) for v in vlan_nrs] for nr, vde_socket, _, _ in vde_sockets: os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix index 339a4b9a7404..67840f3e9fe7 100644 --- a/nixos/tests/run-in-machine.nix +++ b/nixos/tests/run-in-machine.nix @@ -3,7 +3,7 @@ pkgs ? import ../.. { inherit system config; } }: -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; let output = runInMachine { |