Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b854f78991d8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 31112358dbca
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 5, 2018

  1. Revert "NixOS tests: Wait for shell for 10x longer (50m)" 

    This reverts commit 9bc10e1.
    @srhb
    srhb committed Nov 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    GPG key ID: 0D948CE19CF49C5F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    95486ca View commit details

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

    Revert "NixOS tests: Wait for shell for 10x longer (50m)"
    @Mic92
    Mic92 authored Nov 5, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3111235 View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 nixos/lib/test-driver/Machine.pm
3 changes: 1 addition & 2 deletions nixos/lib/test-driver/Machine.pm
View file
Original file line number Diff line number Diff line change
@@ -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;