diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
| commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
| tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /nixos/lib/test-driver/Machine.pm | |
| parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
| parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
| download | nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2 nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip | |
Merge staging into master
Diffstat (limited to 'nixos/lib/test-driver/Machine.pm')
| -rw-r--r-- | nixos/lib/test-driver/Machine.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 78598b3efb4b..7e269b43e70f 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -612,7 +612,7 @@ sub waitForX { my ($self, $regexp) = @_; $self->nest("waiting for the X11 server", sub { retry sub { - my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'"); + my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'Reached target Current graphical'"); return 0 if $status != 0; ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]"); return 1 if $status == 0; |