diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-14 12:38:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 12:38:57 -0500 |
| commit | 95e41ecd8f92311de4f65c73cad943e5add08515 (patch) | |
| tree | a6c5a56ec7129cea60f4962fdb2596790c98ac59 /nixos | |
| parent | b229e9fdfdb7925b808b498bd6ff6cc9b0d55a60 (diff) | |
| parent | 5507e09618c2e2d4a51377d73eb77b3cb9eef01c (diff) | |
| download | nixpkgs-95e41ecd8f92311de4f65c73cad943e5add08515.tar nixpkgs-95e41ecd8f92311de4f65c73cad943e5add08515.tar.gz nixpkgs-95e41ecd8f92311de4f65c73cad943e5add08515.tar.bz2 nixpkgs-95e41ecd8f92311de4f65c73cad943e5add08515.tar.lz nixpkgs-95e41ecd8f92311de4f65c73cad943e5add08515.tar.xz nixpkgs-95e41ecd8f92311de4f65c73cad943e5add08515.tar.zst nixpkgs-95e41ecd8f92311de4f65c73cad943e5add08515.zip | |
Merge pull request #79659 from worldofpeace/cleanup-python-test-lib
testing: fix runInMachineWithX/runInMachine
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/testing-python.nix | 15 | ||||
| -rw-r--r-- | nixos/lib/testing.nix | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index a7f6d792651..6663864f1e5 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -218,12 +218,12 @@ in rec { ''; testScript = '' - startAll; - $client->waitForUnit("multi-user.target"); + start_all() + client.wait_for_unit("multi-user.target") ${preBuild} - $client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2"); + client.succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2") ${postBuild} - $client->succeed("sync"); # flush all data before pulling the plug + client.succeed("sync") # flush all data before pulling the plug ''; vmRunCommand = writeText "vm-run" '' @@ -263,9 +263,12 @@ in rec { { ... }: { inherit require; + imports = [ + ../tests/common/auto.nix + ]; virtualisation.memorySize = 1024; services.xserver.enable = true; - services.xserver.displayManager.auto.enable = true; + test-support.displayManager.auto.enable = true; services.xserver.displayManager.defaultSession = "none+icewm"; services.xserver.windowManager.icewm.enable = true; }; @@ -274,7 +277,7 @@ in rec { machine = client; preBuild = '' - $client->waitForX; + client.wait_for_x() ''; } // args); diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index c82abd1f990..7d6a5c0a290 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -250,9 +250,12 @@ in rec { { ... }: { inherit require; + imports = [ + ../tests/common/auto.nix + ]; virtualisation.memorySize = 1024; services.xserver.enable = true; - services.xserver.displayManager.auto.enable = true; + test-support.displayManager.auto.enable = true; services.xserver.displayManager.defaultSession = "none+icewm"; services.xserver.windowManager.icewm.enable = true; }; |