improve flaky tests (#2956)

Author: tballison

tika-integration-tests/tika-pipes-es-integration-tests/src/test/java/org/apache/tika/pipes/elasticsearch/tests/ElasticsearchTest.java

@@ -178,18 +178,21 @@ public void testBasicFSToElasticsearch(
         assertEquals(1, (int) statusCounts.get("EMIT_SUCCESS"),
                 "should have had 1 emit success: " + statusCounts);
         assertEquals(2, numberOfCrashes(statusCounts),
-                "should have had 2 OOM or 1 OOM and 1 timeout: " + statusCounts);
+                "should have had 2 forked-process crashes (OOM/TIMEOUT/UNSPECIFIED_CRASH): " +
+                        statusCounts);
     }
 
     private int numberOfCrashes(Map<String, Integer> statusCounts) {
-        Integer oom = statusCounts.get("OOM");
-        Integer timeout = statusCounts.get("TIMEOUT");
+        // oom.xml (a real heap exhaustion) and fake_oom.xml both crash the fork; how a genuine OOM
+        // surfaces -- OOM vs UNSPECIFIED_CRASH vs TIMEOUT -- is nondeterministic under load, but all
+        // three are PipesResult PROCESS_CRASH statuses. Count the whole category so the assertion is
+        // deterministic and doesn't flake on the exact sub-classification.
         int sum = 0;
-        if (oom != null) {
-            sum += oom;
-        }
-        if (timeout != null) {
-            sum += timeout;
+        for (String crashStatus : new String[]{"OOM", "TIMEOUT", "UNSPECIFIED_CRASH"}) {
+            Integer cnt = statusCounts.get(crashStatus);
+            if (cnt != null) {
+                sum += cnt;
+            }
         }
         return sum;
     }

tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/OpenSearchTest.java

@@ -155,19 +155,23 @@ public void testBasicFSToOpenSearch(@TempDir Path pipesDirectory, @TempDir Path
         assertEquals(1, (int) statusCounts.get("PARSE_SUCCESS_WITH_EXCEPTION"), "should have had 1 parse exception: " + statusCounts);
         //the embedded docx is emitted directly
         assertEquals(1, (int) statusCounts.get("EMIT_SUCCESS"), "should have had 1 emit success: " + statusCounts);
-        assertEquals(2, numberOfCrashes(statusCounts), "should have had 2 OOM or 1 OOM and 1 timeout: " + statusCounts);
+        assertEquals(2, numberOfCrashes(statusCounts),
+                "should have had 2 forked-process crashes (OOM/TIMEOUT/UNSPECIFIED_CRASH): " +
+                        statusCounts);
 
     }
 
     private int numberOfCrashes(Map<String, Integer> statusCounts) {
-        Integer oom = statusCounts.get("OOM");
-        Integer timeout = statusCounts.get("TIMEOUT");
+        // oom.xml (a real heap exhaustion) and fake_oom.xml both crash the fork; how a genuine OOM
+        // surfaces -- OOM vs UNSPECIFIED_CRASH vs TIMEOUT -- is nondeterministic under load, but all
+        // three are PipesResult PROCESS_CRASH statuses. Count the whole category so the assertion is
+        // deterministic and doesn't flake on the exact sub-classification.
         int sum = 0;
-        if (oom != null) {
-            sum += oom;
-        }
-        if (timeout != null) {
-            sum += timeout;
+        for (String crashStatus : new String[]{"OOM", "TIMEOUT", "UNSPECIFIED_CRASH"}) {
+            Integer cnt = statusCounts.get(crashStatus);
+            if (cnt != null) {
+                sum += cnt;
+            }
         }
         return sum;
     }