Commit ddf0fa97 authored by unknown's avatar unknown

Print warning message if test was failed becuase of cluster install failure

Improve check of wheter test case need slave cluster

parent c3e8fb57
...@@ -2619,21 +2619,24 @@ sub run_testcase_check_skip_test($) ...@@ -2619,21 +2619,24 @@ sub run_testcase_check_skip_test($)
return 1; return 1;
} }
# If test needs cluster, check that master installed ok if ($tinfo->{'ndb_test'})
if ( $tinfo->{'ndb_test'} and !$clusters->[0]->{'installed_ok'} )
{ {
mtr_report_test_name($tinfo); foreach my $cluster (@{$clusters})
mtr_report_test_failed($tinfo); {
return 1; last if ($opt_skip_ndbcluster_slave and
} $cluster->{'name'} eq 'Slave');
# If test needs slave cluster, check that it installed ok # If test needs this cluster, check it was installed ok
if ( $tinfo->{'ndb_test'} and $tinfo->{'slave_num'} and if ( !$cluster->{'installed_ok'} )
!$clusters->[1]->{'installed_ok'} ) {
{ mtr_tofile($path_timefile,
mtr_report_test_name($tinfo); "Test marked as failed because $cluster->{'name'} " .
mtr_report_test_failed($tinfo); "was not installed ok!");
return 1; mtr_report_test_name($tinfo);
mtr_report_test_failed($tinfo);
return 1;
}
}
} }
return 0; return 0;
......
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