try to fix broken tests output capture

Author: strtgbb

ci/jobs/scripts/functional_tests_results.py

@@ -135,7 +135,7 @@ def _process_test_output(self):
                     test_end = False
                 elif (
                     len(test_results) > 0
-                    and test_results[-1][1] in ("FAIL", "SKIPPED")
+                    and test_results[-1][1] in ("FAIL", "SKIPPED", "BROKEN")
                     and not test_end
                 ):
                     test_results[-1][3].append(original_line)

tests/clickhouse-test

@@ -2330,7 +2330,15 @@ class TestCase:
                     )
                     if known_fail_reason:
                         result.status = TestStatus.BROKEN
-                        result.description += f"Marked as broken: {known_fail_reason}"
+                        if "Database: " in result.description.splitlines()[-1]:
+                            result.description = result.description.replace(
+                                "Database: ",
+                                f"Marked as broken: {known_fail_reason}\nDatabase: ",
+                            )
+                        else:
+                            result.description += (
+                                f"\nMarked as broken: {known_fail_reason}"
+                            )
 
             if self.name in suite.blacklist_check:
                 if result.status == TestStatus.OK: