summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2016-12-29 16:19:43 +0100
committerEelco Dolstra <edolstra@gmail.com>2016-12-29 16:23:31 +0100
commitbb0ce819b37b57df15c223fd7e9edaaa737678aa (patch)
tree8b93d3e03978bde0364ca3d1a5c904bbbecebcfa /nixos/tests
parent996e0ef7774642877139ba4aedb1af4951ec5ebb (diff)
downloadnixlib-bb0ce819b37b57df15c223fd7e9edaaa737678aa.tar
nixlib-bb0ce819b37b57df15c223fd7e9edaaa737678aa.tar.gz
nixlib-bb0ce819b37b57df15c223fd7e9edaaa737678aa.tar.bz2
nixlib-bb0ce819b37b57df15c223fd7e9edaaa737678aa.tar.lz
nixlib-bb0ce819b37b57df15c223fd7e9edaaa737678aa.tar.xz
nixlib-bb0ce819b37b57df15c223fd7e9edaaa737678aa.tar.zst
nixlib-bb0ce819b37b57df15c223fd7e9edaaa737678aa.zip
nixos/tests/gnome3.nix: Speed up test
It turns out that "journalctl -f | grep -m 1 pattern" will block for
one more line after "pattern" appears, which can take a long time.
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/gnome3.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index bd8f9502e2fc..4787d42d695a 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
       $machine->succeed("xauth merge ~alice/.Xauthority");
       $machine->waitForWindow(qr/Terminal/);
-      $machine->mustSucceed("timeout 900 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'");
+      $machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'");
       $machine->sleep(10);
       $machine->screenshot("screen");
     '';