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

Merge pull request #26736 from grahamc/improve-nixos-test-debug 

Improve nixos test debug
This commit is contained in:
Graham Christensen 2017-06-21 17:26:18 -04:00 committed by GitHub
parent bc47794ab5 3f40fcabbf
commit dd265313e7
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,8 +219,8 @@ sub waitForMonitorPrompt {
sub retry { sub retry {
my ($coderef) = @_; my ($coderef) = @_;
my $n; my $n;
for ($n = 0; $n < 900; $n++) { for ($n = 899; $n >=0; $n--) {
return if &$coderef; return if &$coderef($n);
sleep 1; sleep 1;
} }
die "action timed out after $n seconds"; die "action timed out after $n seconds";
@ -518,6 +518,12 @@ sub waitUntilTTYMatches {
$self->nest("waiting for $regexp to appear on tty $tty", sub { $self->nest("waiting for $regexp to appear on tty $tty", sub {
retry sub { retry sub {
my ($retries_remaining) = @_;
if ($retries_remaining == 0) {
$self->log("Last chance to match /$regexp/ on TTY$tty, which currently contains:");
$self->log($self->getTTYText($tty));
}
return 1 if $self->getTTYText($tty) =~ /$regexp/; return 1 if $self->getTTYText($tty) =~ /$regexp/;
} }
}); });
@ -566,6 +572,12 @@ sub waitForText {
my ($self, $regexp) = @_; my ($self, $regexp) = @_;
$self->nest("waiting for $regexp to appear on the screen", sub { $self->nest("waiting for $regexp to appear on the screen", sub {
retry sub { retry sub {
my ($retries_remaining) = @_;
if ($retries_remaining == 0) {
$self->log("Last chance to match /$regexp/ on the screen, which currently contains:");
$self->log($self->getScreenText);
}
return 1 if $self->getScreenText =~ /$regexp/; return 1 if $self->getScreenText =~ /$regexp/;
} }
}); });
@ -600,6 +612,13 @@ sub waitForWindow {
$self->nest("waiting for a window to appear", sub { $self->nest("waiting for a window to appear", sub {
retry sub { retry sub {
my @names = $self->getWindowNames; my @names = $self->getWindowNames;
my ($retries_remaining) = @_;
if ($retries_remaining == 0) {
$self->log("Last chance to match /$regexp/ on the the window list, which currently contains:");
$self->log(join(", ", @names));
}
foreach my $n (@names) { foreach my $n (@names) {
return 1 if $n =~ /$regexp/; return 1 if $n =~ /$regexp/;
} }