Commit 965ee310 authored by Kevin Tew's avatar Kevin Tew

Cleanup

parent 5b12cbc6
......@@ -86,6 +86,7 @@ has 'itemid' => ( is => 'rw');
has 'name' => ( is => 'rw');
sub is_error { shift->error; }
sub error_type { ref(shift->error); }
package TestBed::ForkFramework;
sub forkit {
......
......@@ -89,6 +89,10 @@ sub runtests {
}
if ($result->has_errors) {
for (@{$result->errors}) {
my $executor = $s->executor($_->itemid);
warn $executor->failReason($_);
}
sayd($result->errors);
die 'TestBed::ParallelRunner::runtests died during test execution';
}
......
......@@ -108,6 +108,11 @@ sub checkexclude {
return grep { $_ eq $stage } @{ $TBConfig::exclude_steps };
}
sub failReason {
my $s = shift;
sprintf("FAILURE %s: %s", $s->e->eid, shift->error_type);
}
sub execute {
my $s = shift;
my $e = $s->e;
......
......@@ -40,7 +40,7 @@ RETRY:
my $result = eval { $sub->(); };
if ($@) {
if ($@ =~ /SSL_SOCKET_TIMEOUT/) {
warn "SSL_SOCKET_TIMEOUT after $TBConfig::XMLRPC_SERVER_TIMEOUT seconds in $message";
warn "Retrying: SSL_SOCKET_TIMEOUT after $TBConfig::XMLRPC_SERVER_TIMEOUT seconds in $message";
$retry_count++;
redo RETRY;
}
......@@ -60,7 +60,7 @@ RETRY:
my $result = eval { $sub->(); };
if ($@) {
if ($@ =~ /SSL_SOCKET_TIMEOUT/) {
warn "SSL_SOCKET_TIMEOUT after $TBConfig::XMLRPC_SERVER_TIMEOUT seconds in $message";
warn "Retrying Indefinitely: SSL_SOCKET_TIMEOUT after $TBConfig::XMLRPC_SERVER_TIMEOUT seconds in $message";
return 1;
}
else { die $@; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment