summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2016-11-30 11:27:49 -0500
committerGitHub <noreply@github.com>2016-11-30 11:27:49 -0500
commitb28d21fd50e855a0c727a68e59f7049e58bcb3b4 (patch)
tree9856ff504968da15c0bb678579438074ec1cfcf2 /nixos/tests
parent014a1b430a0e52ad75922109ae5bf171720b1cb8 (diff)
parentcb74fd75d700228b441b87a6dc46fba663821a97 (diff)
downloadnixpkgs-b28d21fd50e855a0c727a68e59f7049e58bcb3b4.tar
nixpkgs-b28d21fd50e855a0c727a68e59f7049e58bcb3b4.tar.gz
nixpkgs-b28d21fd50e855a0c727a68e59f7049e58bcb3b4.tar.bz2
nixpkgs-b28d21fd50e855a0c727a68e59f7049e58bcb3b4.tar.lz
nixpkgs-b28d21fd50e855a0c727a68e59f7049e58bcb3b4.tar.xz
nixpkgs-b28d21fd50e855a0c727a68e59f7049e58bcb3b4.tar.zst
nixpkgs-b28d21fd50e855a0c727a68e59f7049e58bcb3b4.zip
Merge pull request #20808 from grahamc/fancy-test-tty
login test: Create and use direct reads of the TTY contents.
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/login.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index e793d89567b..a6a460fb0a7 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -33,10 +33,11 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
 
       # Log in as alice on a virtual console.
       subtest "virtual console login", sub {
-          $machine->sleep(2); # urgh: wait for username prompt
+          $machine->waitUntilTTYMatches(2, "login: ");
           $machine->sendChars("alice\n");
+          $machine->waitUntilTTYMatches(2, "login: alice");
           $machine->waitUntilSucceeds("pgrep login");
-          $machine->sleep(2); # urgh: wait for `Password:'
+          $machine->waitUntilTTYMatches(2, "Password: ");
           $machine->sendChars("foobar\n");
           $machine->waitUntilSucceeds("pgrep -u alice bash");
           $machine->sendChars("touch done\n");