Commit ddf0fa97 authored by unknown's avatar unknown
Browse files

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

Improve check of wheter test case need slave cluster

parent c3e8fb57
Loading
Loading
Loading
Loading
+16 −13
Original line number Diff line number Diff line
@@ -2619,22 +2619,25 @@ sub run_testcase_check_skip_test($)
    return 1;
  }

  # If test needs cluster, check that master installed ok
  if ( $tinfo->{'ndb_test'}  and !$clusters->[0]->{'installed_ok'} )
  if ($tinfo->{'ndb_test'})
  {
    mtr_report_test_name($tinfo);
    mtr_report_test_failed($tinfo);
    return 1;
  }
    foreach my $cluster (@{$clusters})
    {
      last if ($opt_skip_ndbcluster_slave and
	       $cluster->{'name'} eq 'Slave');

  # If test needs slave cluster, check that it installed ok
  if ( $tinfo->{'ndb_test'}  and $tinfo->{'slave_num'} and
       !$clusters->[1]->{'installed_ok'} )
      # If test needs this cluster, check it was installed ok
      if ( !$cluster->{'installed_ok'} )
      {
	mtr_tofile($path_timefile,
		   "Test marked as failed because $cluster->{'name'} " .
		   "was not installed ok!");
	mtr_report_test_name($tinfo);
	mtr_report_test_failed($tinfo);
	return 1;
      }
    }
  }

  return 0;
}