r1851 - in trunk/varnish-tools/regress/lib/Varnish/Test: . Report

[knutroy at projects.linpro.no]

Author: knutroy
Date: 2007-08-17 14:23:45 +0200 (Fri, 17 Aug 2007)
New Revision: 1851

Modified:
   trunk/varnish-tools/regress/lib/Varnish/Test/Case.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Report/report.html
Log:
* Work-around for VCL-loading issue (apparently a race condition somewhere).


Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case.pm	2007-08-16 13:07:55 UTC (rev 1850)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case.pm	2007-08-17 12:23:45 UTC (rev 1851)
@@ -83,7 +83,11 @@
 	my $vcl = $varnish->backend_block('main') . ${ref($self)."::VCL"};
 
 	$varnish->send_vcl(ref($self), $vcl);
-	$self->run_loop('ev_varnish_command_ok');
+	my ($ev, $resp) = $self->run_loop('ev_varnish_command_ok', 'ev_varnish_command_unknown');
+	if ($ev eq 'ev_varnish_command_unknown') {
+	    $self->{'failed'} += 1;
+	    die "Unable to load VCL.\n"
+	}
 	$varnish->use_vcl(ref($self));
 	$self->run_loop('ev_varnish_command_ok');
     }
@@ -182,7 +186,9 @@
 	'count' => $self->{'count'},
 	'pass' => $self->{'successful'},
 	'fail' => $self->{'failed'},
-	'time' => tv_interval($self->{'start'}, $self->{'stop'}),
+	'time' => ((defined($self->{'start'}) and defined($self->{'stop'}))
+		   ? tv_interval($self->{'start'}, $self->{'stop'})
+		   : 0),
     };
 }
 

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Report/report.html
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Report/report.html	2007-08-16 13:07:55 UTC (rev 1850)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Report/report.html	2007-08-17 12:23:45 UTC (rev 1851)
@@ -34,7 +34,7 @@
 	</tr>
       </thead>
 <!-- FOREACH case = cases -->
-<!-- IF case.pass == case.count -->
+<!-- IF case.fail == 0 -->
       <tr class="pass">
 <!-- ELSE -->
       <tr class="fail">