summary refs log tree commit diff
path: root/nixos/tests/login.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-18 01:22:38 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-18 01:22:38 +0200
commit9f65e82b59fde4f7d12c144832e0ff13f8399a40 (patch)
tree555d25d8d4ac51acafc72b8b8bdbe2c2b7eda8c0 /nixos/tests/login.nix
parentffedee6ed523864dd5f871ffd85e3c2099d579a2 (diff)
downloadnixpkgs-9f65e82b59fde4f7d12c144832e0ff13f8399a40.tar
nixpkgs-9f65e82b59fde4f7d12c144832e0ff13f8399a40.tar.gz
nixpkgs-9f65e82b59fde4f7d12c144832e0ff13f8399a40.tar.bz2
nixpkgs-9f65e82b59fde4f7d12c144832e0ff13f8399a40.tar.lz
nixpkgs-9f65e82b59fde4f7d12c144832e0ff13f8399a40.tar.xz
nixpkgs-9f65e82b59fde4f7d12c144832e0ff13f8399a40.tar.zst
nixpkgs-9f65e82b59fde4f7d12c144832e0ff13f8399a40.zip
Make the login test a bit more robust
http://hydra.nixos.org/build/10397037
Diffstat (limited to 'nixos/tests/login.nix')
-rw-r--r--nixos/tests/login.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index 0a7d25c37ac..44c53c231c8 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -9,7 +9,8 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
 
   testScript =
     ''
-      $machine->waitForUnit("default.target");
+      $machine->waitForUnit('multi-user.target');
+      $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty1'");
       $machine->screenshot("postboot");
 
       subtest "create user", sub {
@@ -19,9 +20,11 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
 
       # Check whether switching VTs works.
       subtest "virtual console switching", sub {
+          $machine->fail("pgrep -f 'agetty.*tty2'");
           $machine->sendKeys("alt-f2");
           $machine->waitUntilSucceeds("[ \$(fgconsole) = 2 ]");
           $machine->waitForUnit('getty@tty2.service');
+          $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty2'");
       };
 
       # Log in as alice on a virtual console.