branch-2.1: [Fix](regression) Fix define global var in regression case …

…#46531 (#46735) Cherry-picked from #46531 Co-authored-by: bobhan1 <[email protected]>
apache · Jan 10, 2025 · 177752f · 177752f
1 parent 62ad145
commit 177752f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/regression-test/suites/fault_injection_p0/test_full_compaction_with_ordered_data.groovy b/regression-test/suites/fault_injection_p0/test_full_compaction_with_ordered_data.groovy
@@ -60,7 +60,7 @@ suite("test_full_compaction_with_ordered_data","nonConcurrent") {
         int rowsetCount = 0
         for (def tablet in tablets) {
             String tablet_id = tablet.TabletId
-            (code, out, err) = curl("GET", tablet.CompactionStatus)
+            def (code, out, err) = curl("GET", tablet.CompactionStatus)
             logger.info("Show tablets status: code=" + code + ", out=" + out + ", err=" + err)
             assertEquals(code, 0)
             def tabletJson = parseJson(out.trim())
@@ -76,7 +76,7 @@ suite("test_full_compaction_with_ordered_data","nonConcurrent") {
         rowsetCount = 0
         for (def tablet in tablets) {
             String tablet_id = tablet.TabletId
-            (code, out, err) = curl("GET", tablet.CompactionStatus)
+            def (code, out, err) = curl("GET", tablet.CompactionStatus)
             logger.info("Show tablets status: code=" + code + ", out=" + out + ", err=" + err)
             assertEquals(code, 0)
             def tabletJson = parseJson(out.trim())
@@ -132,7 +132,7 @@ suite("test_full_compaction_with_ordered_data","nonConcurrent") {
         rowsetCount = 0
         for (def tablet in tablets) {
             String tablet_id = tablet.TabletId
-            (code, out, err) = curl("GET", tablet.CompactionStatus)
+            def (code, out, err) = curl("GET", tablet.CompactionStatus)
             logger.info("Show tablets status: code=" + code + ", out=" + out + ", err=" + err)
             assertEquals(code, 0)
             def tabletJson = parseJson(out.trim())

diff --git a/...est/suites/fault_injection_p2/test_partial_update_rowset_not_found_fault_injection.groovy b/...est/suites/fault_injection_p2/test_partial_update_rowset_not_found_fault_injection.groovy
@@ -94,8 +94,8 @@ suite("test_partial_update_rowset_not_found_fault_injection", "p2,nonConcurrent"
         def tablets = sql_return_maparray """ show tablets from ${testTable}; """
         for (def tablet in tablets) {
             String tablet_id = tablet.TabletId
-            backend_id = tablet.BackendId
-            (code, out, err) = be_run_cumulative_compaction(backendId_to_backendIP.get(backend_id), backendId_to_backendHttpPort.get(backend_id), tablet_id)
+            def backend_id = tablet.BackendId
+            def (code, out, err) = be_run_cumulative_compaction(backendId_to_backendIP.get(backend_id), backendId_to_backendHttpPort.get(backend_id), tablet_id)
             logger.info("Run compaction: code=" + code + ", out=" + out + ", err=" + err)
             assertEquals(code, 0)
         }