ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79659 from worldofpeace/cleanup-python-test-lib

Browse Source 
testing: fix runInMachineWithX/runInMachine
This commit is contained in:
worldofpeace 2020-02-14 12:38:57 -05:00 committed by GitHub
commit 95e41ecd8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,12 +218,12 @@ in rec {
''; '';
testScript = '' testScript = ''
startAll; start_all()
$client->waitForUnit("multi-user.target"); client.wait_for_unit("multi-user.target")
${preBuild} ${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} ${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" '' vmRunCommand = writeText "vm-run" ''
@ -263,9 +263,12 @@ in rec {
{ ... }: { ... }:
{ {
inherit require; inherit require;
imports = [
../tests/common/auto.nix
];
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.auto.enable = true; test-support.displayManager.auto.enable = true;
services.xserver.displayManager.defaultSession = "none+icewm"; services.xserver.displayManager.defaultSession = "none+icewm";
services.xserver.windowManager.icewm.enable = true; services.xserver.windowManager.icewm.enable = true;
}; };
@ -274,7 +277,7 @@ in rec {
machine = client; machine = client;
preBuild = preBuild =
'' ''
$client->waitForX; client.wait_for_x()
''; '';
} // args); } // args);

5
nixos/lib/testing.nix
View File

@ -250,9 +250,12 @@ in rec {
{ ... }: { ... }:
{ {
inherit require; inherit require;
imports = [
../tests/common/auto.nix
];
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.auto.enable = true; test-support.displayManager.auto.enable = true;
services.xserver.displayManager.defaultSession = "none+icewm"; services.xserver.displayManager.defaultSession = "none+icewm";
services.xserver.windowManager.icewm.enable = true; services.xserver.windowManager.icewm.enable = true;
}; };