Merge pull request #49777 from srhb/restore-test-timeout

Revert "NixOS tests: Wait for shell for 10x longer (50m)"
2018-11-05 11:16:42 +00:00
parent b854f78991 95486ca306
commit 31112358db
1 changed files with 1 additions and 2 deletions
--- 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;