Fix tests

Author: benchaplin

test/framework/src/main/java/org/elasticsearch/test/MockLog.java

@@ -344,10 +344,8 @@ public void match(LogEvent event) {
                     && event.getThrown().getClass() == clazz
                     && event.getThrown().getMessage().equals(exceptionMessage);
 
-                if (exceptionMatches) {
-                    if (patternMatches) {
-                        seenLatch.countDown();
-                    }
+                if (patternMatches && exceptionMatches) {
+                    seenLatch.countDown();
                 }
             }
         }

x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchErrorTraceIT.java

@@ -167,18 +167,19 @@ public void testLoggingInAsyncSearchFailingQueryErrorTraceTrue() throws IOExcept
         searchRequest.addParameter("error_trace", "true");
         searchRequest.addParameter("keep_on_completion", "true");
         searchRequest.addParameter("wait_for_completion_timeout", "0ms");
-        Map<String, Object> responseEntity = performRequestAndGetResponseEntityAfterDelay(searchRequest, TimeValue.ZERO);
-        String asyncExecutionId = (String) responseEntity.get("id");
-        Request request = new Request("GET", "/_async_search/" + asyncExecutionId);
-        request.addParameter("error_trace", "true");
-        while (responseEntity.get("is_running") instanceof Boolean isRunning && isRunning) {
-            responseEntity = performRequestAndGetResponseEntityAfterDelay(request, TimeValue.timeValueSeconds(1L));
-        }
 
         String errorTriggeringIndex = "test2";
         try (var mockLog = MockLog.capture(SearchService.class)) {
             ErrorTraceHelper.addUnseenLoggingExpectations(numShards, mockLog, errorTriggeringIndex);
 
+            Map<String, Object> responseEntity = performRequestAndGetResponseEntityAfterDelay(searchRequest, TimeValue.ZERO);
+            String asyncExecutionId = (String) responseEntity.get("id");
+            Request request = new Request("GET", "/_async_search/" + asyncExecutionId);
+            request.addParameter("error_trace", "true");
+            while (responseEntity.get("is_running") instanceof Boolean isRunning && isRunning) {
+                responseEntity = performRequestAndGetResponseEntityAfterDelay(request, TimeValue.timeValueSeconds(1L));
+            }
+
             getRestClient().performRequest(searchRequest);
             mockLog.assertAllExpectationsMatched();
         }
@@ -205,20 +206,21 @@ public void testLoggingInAsyncSearchFailingQueryErrorTraceFalse() throws IOExcep
         }
         searchRequest.addParameter("keep_on_completion", "true");
         searchRequest.addParameter("wait_for_completion_timeout", "0ms");
-        Map<String, Object> responseEntity = performRequestAndGetResponseEntityAfterDelay(searchRequest, TimeValue.ZERO);
-        String asyncExecutionId = (String) responseEntity.get("id");
-        Request request = new Request("GET", "/_async_search/" + asyncExecutionId);
-        if (defineErrorTraceFalse) {
-            request.addParameter("error_trace", "false");
-        }
-        while (responseEntity.get("is_running") instanceof Boolean isRunning && isRunning) {
-            responseEntity = performRequestAndGetResponseEntityAfterDelay(request, TimeValue.timeValueSeconds(1L));
-        }
 
         String errorTriggeringIndex = "test2";
         try (var mockLog = MockLog.capture(SearchService.class)) {
             ErrorTraceHelper.addSeenLoggingExpectations(numShards, mockLog, errorTriggeringIndex);
 
+            Map<String, Object> responseEntity = performRequestAndGetResponseEntityAfterDelay(searchRequest, TimeValue.ZERO);
+            String asyncExecutionId = (String) responseEntity.get("id");
+            Request request = new Request("GET", "/_async_search/" + asyncExecutionId);
+            if (defineErrorTraceFalse) {
+                request.addParameter("error_trace", "false");
+            }
+            while (responseEntity.get("is_running") instanceof Boolean isRunning && isRunning) {
+                responseEntity = performRequestAndGetResponseEntityAfterDelay(request, TimeValue.timeValueSeconds(1L));
+            }
+
             getRestClient().performRequest(searchRequest);
             mockLog.assertAllExpectationsMatched();
         }