From 56435c140413ae43530d03ae1db3c8cdd43d3838 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 20 Jun 2017 19:53:25 -0400 Subject: [PATCH] nixos tests: retry: Count down to 0, and pass remaining attempts to the sub Allows test functions to output diagnostic information on failure. --- nixos/lib/test-driver/Machine.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 6be119bbf33..c88f9f2bbbe 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -219,8 +219,8 @@ sub waitForMonitorPrompt { sub retry { my ($coderef) = @_; my $n; - for ($n = 0; $n < 900; $n++) { - return if &$coderef; + for ($n = 899; $n >=0; $n--) { + return if &$coderef($n); sleep 1; } die "action timed out after $n seconds";