(accumulo) branch 2.1 updated: Fixes json extraction in FateSummaryIT (#5002)

[kturner]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
     new e206ff9b77 Fixes json extraction in FateSummaryIT (#5002)
e206ff9b77 is described below

commit e206ff9b77e116e2bde7d050d81587727036fd65
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Fri Oct 18 14:09:19 2024 -0400

    Fixes json extraction in FateSummaryIT (#5002)
    
    FateSummaryIT ran an external command that would output log messages and
    json.  The test wanted to extract only the json from the command output.
    The extraction was broken by a recent change to log messages that
    included a curly brace.  Modified the extraction to tolerate this.
---
 .../main/java/org/apache/accumulo/test/FateSummaryIT.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/src/main/java/org/apache/accumulo/test/FateSummaryIT.java 
b/test/src/main/java/org/apache/accumulo/test/FateSummaryIT.java
index 5f2543bc1b..7830de57d9 100644
--- a/test/src/main/java/org/apache/accumulo/test/FateSummaryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/FateSummaryIT.java
@@ -113,7 +113,9 @@ public class FateSummaryIT extends ConfigurableMacBase {
           "IN_PROGRESS", "-s", "FAILED");
       assertEquals(0, p.getProcess().waitFor());
       String result = p.readStdOut();
-      result = result.substring(result.indexOf("{"), result.lastIndexOf("}") + 
1);
+      // remove any log messages
+      result = result.lines().filter(line -> 
!line.matches(".*(INFO|DEBUG|WARN|ERROR).*"))
+          .collect(Collectors.joining("\n"));
       FateSummaryReport report = FateSummaryReport.fromJson(result);
       assertNotNull(report);
       assertNotEquals(0, report.getReportTime());
@@ -134,7 +136,8 @@ public class FateSummaryIT extends ConfigurableMacBase {
       p = getCluster().exec(Admin.class, "fate", "--summary", "-j");
       assertEquals(0, p.getProcess().waitFor());
       result = p.readStdOut();
-      result = result.substring(result.indexOf("{"), result.lastIndexOf("}") + 
1);
+      result = result.lines().filter(line -> 
!line.matches(".*(INFO|DEBUG|WARN|ERROR).*"))
+          .collect(Collectors.joining("\n"));
       report = FateSummaryReport.fromJson(result);
       assertNotNull(report);
       assertNotEquals(0, report.getReportTime());
@@ -153,7 +156,8 @@ public class FateSummaryIT extends ConfigurableMacBase {
       p = getCluster().exec(Admin.class, "fate", txns.get(0), txns.get(1), 
"--summary", "-j");
       assertEquals(0, p.getProcess().waitFor());
       result = p.readStdOut();
-      result = result.substring(result.indexOf("{"), result.lastIndexOf("}") + 
1);
+      result = result.lines().filter(line -> 
!line.matches(".*(INFO|DEBUG|WARN|ERROR).*"))
+          .collect(Collectors.joining("\n"));
       report = FateSummaryReport.fromJson(result);
       assertNotNull(report);
       assertNotEquals(0, report.getReportTime());
@@ -167,7 +171,8 @@ public class FateSummaryIT extends ConfigurableMacBase {
       p = getCluster().exec(Admin.class, "fate", "--summary", "-j", "-s", 
"FAILED");
       assertEquals(0, p.getProcess().waitFor());
       result = p.readStdOut();
-      result = result.substring(result.indexOf("{"), result.lastIndexOf("}") + 
1);
+      result = result.lines().filter(line -> 
!line.matches(".*(INFO|DEBUG|WARN|ERROR).*"))
+          .collect(Collectors.joining("\n"));
       report = FateSummaryReport.fromJson(result);
       assertNotNull(report);
       assertNotEquals(0, report.getReportTime());