From 9f65e82b59fde4f7d12c144832e0ff13f8399a40 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 Apr 2014 01:22:38 +0200 Subject: Make the login test a bit more robust http://hydra.nixos.org/build/10397037 --- nixos/tests/login.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nixos/tests/login.nix') 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. -- cgit 1.4.1