public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Revert "NixOS tests: Wait for shell for 10x longer (50m)"
This commit is contained in:
Jörg Thalheim 2018-11-05 11:16:42 +00:00 committed by GitHub
parent b854f78991 95486ca306
commit 31112358db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/lib/test-driver/Machine.pm
View File

@ -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;