Commit cd927dd3 authored by Anel Husakovic's avatar Anel Husakovic

MDEV-23769: MTR can abort before it prints the test result summary

- Patch is solving generating report on warning
        To repeat the error run single worker:
        ```
        ./mtr --mysqld=--lock-wait-timeout=-xx 1st 1st --force --parallel 1
        ```
        or `N` workers with `N+1` tests with failures and `force`
        ```
        ./mtr --mysqld=--lock-wait-timeout=-xx 1st 1st grant5 --force --parallel 2
        ```
- Patch is doing cosmetic fix of `current_test` log file which holds the old log value of test `CURRENT TEST:..` in `mark_log()` in case of `unknown option` and as such
  the logic which is using it's content doesn't output valid log content and doesn't generate valid `$test->{'comment'}` message.asdf

- Closing the socket/handler after the removing the handler from IO for
consistency

Reviewed by: serg@mariadb.com
parent 5171ab80
...@@ -802,6 +802,7 @@ sub run_test_server ($$$) { ...@@ -802,6 +802,7 @@ sub run_test_server ($$$) {
# Client disconnected # Client disconnected
mtr_verbose("Child closed socket"); mtr_verbose("Child closed socket");
$s->remove($sock); $s->remove($sock);
$sock->close;
if (--$childs == 0){ if (--$childs == 0){
return ("Completed", $test_failure, $completed, $extra_warnings); return ("Completed", $test_failure, $completed, $extra_warnings);
} }
...@@ -971,6 +972,7 @@ sub run_test_server ($$$) { ...@@ -971,6 +972,7 @@ sub run_test_server ($$$) {
# Test failure due to warnings, force is off # Test failure due to warnings, force is off
return ("Warnings in log", 1, $completed, $extra_warnings); return ("Warnings in log", 1, $completed, $extra_warnings);
} }
next;
} }
elsif ($line =~ /^SPENT/) { elsif ($line =~ /^SPENT/) {
add_total_times($line); add_total_times($line);
...@@ -4184,6 +4186,7 @@ sub run_testcase ($$) { ...@@ -4184,6 +4186,7 @@ sub run_testcase ($$) {
if (start_servers($tinfo)) if (start_servers($tinfo))
{ {
report_failure_and_restart($tinfo); report_failure_and_restart($tinfo);
unlink $path_current_testlog;
return 1; return 1;
} }
} }
......
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