summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-21 11:04:45 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-21 11:04:45 +0200
commit35925d7a768a951809a6bb4aa0004f3fcb0139ed (patch)
tree0e957564def48dc171653b154258d4c7a3fe2370 /nixos
parente5eed8f664891e7337c1c70a654930617da4247b (diff)
downloadnixlib-35925d7a768a951809a6bb4aa0004f3fcb0139ed.tar
nixlib-35925d7a768a951809a6bb4aa0004f3fcb0139ed.tar.gz
nixlib-35925d7a768a951809a6bb4aa0004f3fcb0139ed.tar.bz2
nixlib-35925d7a768a951809a6bb4aa0004f3fcb0139ed.tar.lz
nixlib-35925d7a768a951809a6bb4aa0004f3fcb0139ed.tar.xz
nixlib-35925d7a768a951809a6bb4aa0004f3fcb0139ed.tar.zst
nixlib-35925d7a768a951809a6bb4aa0004f3fcb0139ed.zip
Fix installer test
The installer now asks the user to set a root password if stdin is a
tty, which doesn't work for an interactive test.

http://hydra.nixos.org/build/11130072
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/installer.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 9149b1bff02f..bc3a757ad54e 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -161,10 +161,10 @@ let
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
-      $machine->succeed("nixos-install >&2");
+      $machine->succeed("nixos-install < /dev/null >&2");
 
       # Do it again to make sure it's idempotent.
-      $machine->succeed("nixos-install >&2");
+      $machine->succeed("nixos-install < /dev/null >&2");
 
       $machine->succeed("umount /mnt/boot || true");
       $machine->succeed("umount /mnt");