movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos X tests: wait for logind to link a session to the server

Browse source 
There seems to be some race causing failures if an X command gets in before slim starts the session

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2014-01-22 14:23:56 -05:00
parent 058fd7eeea
commit 51de280c0a
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/lib/test-driver/Machine.pm
View file

@ -495,6 +495,8 @@ sub waitForX {
my ($self, $regexp) = @_;
$self->nest("waiting for the X11 server", sub {
retry sub {
my ($status, $out) = $self->execute("journalctl -bu systemd-logind | grep Linked");
return 0 if $status != 0;
my ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
return 1 if $status == 0;
}