nixos/test-instrumentation: softcode DISPLAY

2017-11-07 23:01:59 +01:00
parent a41342ba58
commit 4531ec5955
2 changed files with 9 additions and 5 deletions
@@ -602,8 +602,11 @@ sub waitForX {
    $self->nest("waiting for the X11 server", sub {
        retry sub {
            my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'");
+            my $display = $ENV{'DISPLAY'};
+            $display =~ s/://;
+
            return 0 if $status != 0;
-            ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]");
+            ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X$display ]");
            return 1 if $status == 0;
        }
    });