fix ci

Signed-off-by: xufei <[email protected]>
pingcap · Jun 29, 2022 · 67f4a4b · 67f4a4b
1 parent dfc24cb
commit 67f4a4b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/tests/fullstack-test/mpp/issue_2471.test b/tests/fullstack-test/mpp/issue_2471.test
@@ -40,6 +40,10 @@ ERROR 1105 (HY000) at line 1: other error for mpp stream: Code: 10007, e.display
 {#LINE}
 {#LINE}
 {#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
 
 => DBGInvoke __disable_fail_point(exception_in_creating_set_input_stream)
 

diff --git a/tests/fullstack-test/mpp/mpp_fail.test b/tests/fullstack-test/mpp/mpp_fail.test
@@ -75,6 +75,10 @@ ERROR 1105 (HY000) at line 1: other error for mpp stream: Code: 0, e.displayText
 {#LINE}
 {#LINE}
 {#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
 => DBGInvoke __disable_fail_point(exception_during_mpp_non_root_task_run)
 
 ## exception during mpp run root task
@@ -85,6 +89,10 @@ ERROR 1105 (HY000) at line 1: other error for mpp stream: Code: 10007, e.display
 {#LINE}
 {#LINE}
 {#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
 => DBGInvoke __disable_fail_point(exception_during_mpp_root_task_run)
 
 ## exception during mpp write err to tunnel
@@ -97,6 +105,10 @@ ERROR 1105 (HY000) at line 1: other error for mpp stream: Code: 0, e.displayText
 {#LINE}
 {#LINE}
 {#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
 => DBGInvoke __disable_fail_point(exception_during_mpp_non_root_task_run)
 => DBGInvoke __disable_fail_point(exception_during_mpp_write_err_to_tunnel)
 
@@ -108,6 +120,10 @@ ERROR 1105 (HY000) at line 1: other error for mpp stream: Code: 0, e.displayText
 {#LINE}
 {#LINE}
 {#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
 => DBGInvoke __disable_fail_point(exception_during_mpp_non_root_task_run)
 => DBGInvoke __disable_fail_point(exception_during_mpp_close_tunnel)
 
@@ -146,6 +162,10 @@ ERROR 1105 (HY000) at line 1: other error for mpp stream: Code: 10007, e.display
 {#LINE}
 {#LINE}
 {#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
+{#LINE}
 => DBGInvoke __disable_fail_point(exception_mpp_hash_build)
 
 # Clean up.

diff --git a/tests/run-test.py b/tests/run-test.py
@@ -199,11 +199,14 @@ def matched(outputs, matches):
             b = MySQLCompare.parse_excepted_outputs(matches)
             return a == b
         else:
-            if len(outputs) != len(matches):
+            if len(outputs) > len(matches):
                 return False
             for i in range(0, len(outputs)):
                 if not compare_line(outputs[i], matches[i]):
                     return False
+            for i in range(len(outputs), len(matches)):
+                if not compare_line("", matches[i]):
+                    return False
             return True
 
 
@@ -217,11 +220,14 @@ def matched(outputs, matches, fuzz):
         b = parse_table_parts(matches, fuzz)
         return a == b
     else:
-        if len(outputs) != len(matches):
+        if len(outputs) > len(matches):
             return False
         for i in range(0, len(outputs)):
             if not compare_line(outputs[i], matches[i]):
                 return False
+        for i in range(len(outputs), len(matches)):
+            if not compare_line("", matches[i]):
+                return False
         return True
-Original file line number
+Diff line change
@@ Expand Up @@
     {#LINE}
     {#LINE}
     {#LINE}
+    {#LINE}
+    {#LINE}
+    {#LINE}
+    {#LINE}
     => DBGInvoke __disable_fail_point(exception_in_creating_set_input_stream)
@@ Expand Down @@