SERVER-46026 Fix tests reliant on specific log lines

1 files changed, 13 insertions, 0 deletions

diff --git a/jstests/sharding/libs/sharded_transactions_helpers.js b/jstests/sharding/libs/sharded_transactions_helpers.js
index 0fdd971a834..38579460dce 100644
--- a/jstests/sharding/libs/sharded_transactions_helpers.js
+++ b/jstests/sharding/libs/sharded_transactions_helpers.js
@@ -1,3 +1,5 @@
+load("jstests/libs/logv2_helpers.js");
+
 const kSnapshotErrors =
     [ErrorCodes.SnapshotTooOld, ErrorCodes.SnapshotUnavailable, ErrorCodes.StaleChunkHistory];
 
@@ -97,6 +99,17 @@ function assertNoSuchTransactionOnConn(conn, lsid, txnNumber) {
 
 function waitForFailpoint(hitFailpointStr, numTimes, timeout) {
     // Don't run the hang analyzer because we don't expect waitForFailpoint() to always succeed.
+    if (isJsonLogNoConn()) {
+        const hitFailpointRe = /Hit (\w+) failpoint/;
+        const hitRe = /Hit (\w+)/;
+        const matchHitFailpoint = hitFailpointStr.match(hitFailpointRe);
+        const matchHit = hitFailpointStr.match(hitRe);
+        if (matchHitFailpoint) {
+            hitFailpointStr = `(Hit .+ failpoint.*${matchHitFailpoint[1]}|${hitFailpointStr})`;
+        } else {
+            hitFailpointStr = `(Hit .+.*${matchHit[1]}|${hitFailpointStr})`;
+        }
+    }
     assert.soon(
         function() {
             const re = new RegExp(hitFailpointStr, 'g' /* find all occurrences */);