database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-22273 jUnit patch: xml test result differs from MTR output in case if retry

Browse Source
This commit is contained in:
Rasmus Johansson
2020-05-04 10:10:07 +00:00
parent dc2a858bed
commit 95fa7bc89d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/lib/mtr_report.pm
View File

@ -472,12 +472,15 @@ sub mtr_report_stats ($$$$) {
my $comment = $test->{'comment'}; my $comment = $test->{'comment'};
$comment =~ s/[\"]//g; $comment =~ s/[\"]//g;
if ($test->{'result'} eq "MTR_RES_FAILED") { # if a test case has to be retried it should have the result MTR_RES_FAILED in jUnit XML
$xml_report .= qq(>\n\t\t\t<failure message="" type="$test->{'result'}">\n<![CDATA[$test->{'logfile'}]]>\n\t\t\t</failure>\n\t\t</testcase>\n); if ($test->{'result'} eq "MTR_RES_FAILED" || $test->{'retries'}) {
my $logcontents = $test->{'logfile-failed'} || $test->{'logfile'};
$xml_report .= qq(>\n\t\t\t<failure message="" type="MTR_RES_FAILED">\n<![CDATA[$logcontents]]>\n\t\t\t</failure>\n\t\t</testcase>\n);
} elsif ($test->{'result'} eq "MTR_RES_SKIPPED" && $test->{'disable'}) { } elsif ($test->{'result'} eq "MTR_RES_SKIPPED" && $test->{'disable'}) {
$xml_report .= qq(>\n\t\t\t<disabled message="$comment" type="$test->{'result'}"/>\n\t\t</testcase>\n); $xml_report .= qq(>\n\t\t\t<disabled message="$comment" type="MTR_RES_SKIPPED"/>\n\t\t</testcase>\n);
} elsif ($test->{'result'} eq "MTR_RES_SKIPPED") { } elsif ($test->{'result'} eq "MTR_RES_SKIPPED") {
$xml_report .= qq(>\n\t\t\t<skipped message="$comment" type="$test->{'result'}"/>\n\t\t</testcase>\n); $xml_report .= qq(>\n\t\t\t<skipped message="$comment" type="MTR_RES_SKIPPED"/>\n\t\t</testcase>\n);
} else { } else {
$xml_report .= " />\n"; $xml_report .= " />\n";
} }

1
mysql-test/mysql-test-run.pl
View File

@ -769,6 +769,7 @@ sub run_test_server ($$$) {
if ( $result->is_failed() ) { if ( $result->is_failed() ) {
my $worker_logdir= $result->{savedir}; my $worker_logdir= $result->{savedir};
my $log_file_name=dirname($worker_logdir)."/".$result->{shortname}.".log"; my $log_file_name=dirname($worker_logdir)."/".$result->{shortname}.".log";
$result->{'logfile-failed'} = mtr_lastlinesfromfile($log_file_name, 20);
rename $log_file_name,$log_file_name.".failed"; rename $log_file_name,$log_file_name.".failed";
} }
delete($result->{result}); delete($result->{result});