about summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-09-30 13:26:04 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-09-30 13:26:04 -0700
commite7bb9e102323f79832c2e0553b98651a582368c9 (patch)
tree029f5217f94e4a0d1f082fb19b90d5b8a00ca6ee /nixos/tests
parentd14bb302a7de75ec91e48e1efb4ed5c123c96e3b (diff)
parent647671bc537d35923fdaa6f7c03385868635d615 (diff)
downloadnixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar
nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar.gz
nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar.bz2
nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar.lz
nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar.xz
nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar.zst
nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.zip
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/gnome3.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index f5e0159f1c7d..7662efe1b350 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -28,7 +28,8 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
       $machine->waitForWindow(qr/Terminal/);
-      $machine->sleep(20);
+      $machine->mustSucceed("timeout 60 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'");
+      $machine->sleep(10);
       $machine->screenshot("screen");
     '';
 })