summary refs log tree commit diff
path: root/nixos/lib
diff options
context:
space:
mode:
authorSarah Brofeldt <sbrofeldt@gmail.com>2018-11-05 08:58:08 +0000
committerSarah Brofeldt <sbrofeldt@gmail.com>2018-11-05 08:58:08 +0000
commit95486ca306fc72d23ed4568b91afe35b6af9fab1 (patch)
tree1c84da865c1caa7b2c390334fe42c6f38738b5bc /nixos/lib
parentc7a5b771dfce849b829874085376ff2d2c3ec385 (diff)
downloadnixlib-95486ca306fc72d23ed4568b91afe35b6af9fab1.tar
nixlib-95486ca306fc72d23ed4568b91afe35b6af9fab1.tar.gz
nixlib-95486ca306fc72d23ed4568b91afe35b6af9fab1.tar.bz2
nixlib-95486ca306fc72d23ed4568b91afe35b6af9fab1.tar.lz
nixlib-95486ca306fc72d23ed4568b91afe35b6af9fab1.tar.xz
nixlib-95486ca306fc72d23ed4568b91afe35b6af9fab1.tar.zst
nixlib-95486ca306fc72d23ed4568b91afe35b6af9fab1.zip
Revert "NixOS tests: Wait for shell for 10x longer (50m)"
This reverts commit 9bc10e12916979c5c620be5b521b9218a0077cba.
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/test-driver/Machine.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index abcc1c50d4d8..a00fe25c2b8e 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -250,8 +250,7 @@ sub connect {
         $self->start;
 
         local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; };
-        # 50 minutes -- increased as a test, see #49441
-        alarm 3000;
+        alarm 300;
         readline $self->{socket} or die "the VM quit before connecting\n";
         alarm 0;