Commit cfe7a3d7 authored by Kevin Tew's avatar Kevin Tew

testsuite/testswap Fixes

parent a601c165
......@@ -68,7 +68,7 @@ sub runtests {
my $workscheduler = TestBed::ForkFramework::WeightedScheduler->new(
items => $Executors,
proc => &tap_wrapper,
proc => \&tap_wrapper,
maxnodes => $concurrent_node_count_usage,
);
......@@ -84,7 +84,7 @@ sub runtests {
warn "$eid requires upto $maximum_nodes nodes, only $concurrent_node_count_usage concurrent nodes permitted\n$eid will not be run";
}
else {
$workscheduler->add_task($itemId, $maximum_nodes);
$workscheduler->add_task($executor, $maximum_nodes);
$total_test_count += $executor->test_count;
}
}
......
......@@ -66,7 +66,6 @@ sub parse_options {
sub buildt { shift; TestBed::ParallelRunner::Executor->new( parse_options(@_)); }
sub build {
shift;
my ($e, $ns, $sub, $test_count, $desc) = (shift, shift, shift, shift, shift);
return TestBed::ParallelRunner::Executor->new(
'e' => $e,
......
......@@ -72,12 +72,9 @@ sub single_request {
say("Received");
say Dumper($resp);
}
if ((!ref($resp)) && ($resp =~ /SSL \w+ timeout/)) {
die "SSL_SOCKET_TIMEOUT";
}
if ($resp->isa('RPC::XML::struct') && $resp->value->{'code'} != 0 ) {
die $resp;
}
if ((!ref($resp)) && ($resp =~ /SSL \w+ timeout/)) { die "SSL_SOCKET_TIMEOUT"; }
if ($resp->isa('RPC::XML::fault')) { die $resp->{faultString}; }
if ($resp->isa('RPC::XML::struct') && $resp->value->{'code'} != 0 ) { die $resp; }
$resp;
}
......
......@@ -53,8 +53,9 @@ sub end_all_experiments {
e->pretty_list;
say "";
if (yn_prompt("Are you sure you want to terminate all experiments?")) {
e(@{$_->[0]})->end for( experiments_hash_to_list(e->list_full));
e(@{$_->[0]})->waitforended for( experiments_hash_to_list(e->list_full));
my @experiment_names = experiments_hash_to_list(e->getlist_full);
e(@{$_->[0]})->end for(@experiment_names);
e(@{$_->[0]})->waitforended for(@experiment_names);
}
}
......
......@@ -95,15 +95,13 @@ if (@ARGV) {
if (/.*\.t$/ || /.*\.pm$/) { runharness(@ARGV); }
elsif ($_ eq 'podc') { system 'for x in `find lib -iname "*.pm"`; do podchecker $x 2>&1 |grep contain; done; '; }
elsif ($_ eq 'pode') { system 'for x in `find lib -iname "*.pm"`; do podchecker $x 2>&1 |grep ERROR; done;'; }
elsif ($_ eq 'pode') {
eval { use Pod::Coverage; };
unless ($@) {
my $pc = Pod::Coverage->new(package => 'Pod::Coverage');
print "We rock!" if $pc->coverage == 1;
eval { use Pod::Coverage; };
unless ($@) {
my $pc = Pod::Coverage->new(package => 'Pod::Coverage');
print "We rock!" if $pc->coverage == 1;
}
}
}
elsif (/critic/) { exec 'perlcritic lib t'; }
elsif (/sanity/) { runharness( qw(t/lib/*.t t/lib/*/*.t t/xmlrpc/*.t) ); }
elsif (/lib/) { runharness qw(t/lib/*.t t/lib/*/*.t); }
......
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