diff options
| author | Gabriel Russell <gabriel.russell@mongodb.com> | 2020-06-18 16:04:40 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-06-18 23:39:46 +0000 |
| commit | 8bc06dc92b364757090785fccc9a93f295147bc1 (patch) | |
| tree | 81803bcedf4ebe0bd0f7f2b4dd5476234f2b63ae | |
| parent | 9fd10955e1083d61db542f0dadb00b5a9ddd8222 (diff) | |
| download | mongo-8bc06dc92b364757090785fccc9a93f295147bc1.tar.gz | |
SERVER-48976 jstests/core tests need to use isJsonLog() because multiversion
| -rw-r--r-- | jstests/core/getlog2.js | 2 | ||||
| -rw-r--r-- | jstests/core/txns/kill_op_on_txn_expiry.js | 2 | ||||
| -rw-r--r-- | jstests/core/txns/speculative_snapshot_includes_all_writes.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/jstests/core/getlog2.js b/jstests/core/getlog2.js index ea37bbbb8fa..76478464567 100644 --- a/jstests/core/getlog2.js +++ b/jstests/core/getlog2.js @@ -31,7 +31,7 @@ function contains(arr, func) { } function stringContains(haystack, needle) { - if (isJsonLogNoConn()) { + if (isJsonLog(db.getMongo())) { if (needle.indexOf(":")) needle = '"' + needle.replace(':', "\":"); needle = needle.replace(/ /g, ""); diff --git a/jstests/core/txns/kill_op_on_txn_expiry.js b/jstests/core/txns/kill_op_on_txn_expiry.js index ca2068444c0..7762905f569 100644 --- a/jstests/core/txns/kill_op_on_txn_expiry.js +++ b/jstests/core/txns/kill_op_on_txn_expiry.js @@ -72,7 +72,7 @@ try { failPoint.wait(); jsTestLog("Wait for the transaction to expire"); - if (isJsonLogNoConn()) { + if (isJsonLog(db.getMongo())) { checkLog.contains( db.getMongo(), new RegExp( diff --git a/jstests/core/txns/speculative_snapshot_includes_all_writes.js b/jstests/core/txns/speculative_snapshot_includes_all_writes.js index 47b34fb28d4..dde9ecce623 100644 --- a/jstests/core/txns/speculative_snapshot_includes_all_writes.js +++ b/jstests/core/txns/speculative_snapshot_includes_all_writes.js @@ -61,7 +61,7 @@ const joinHungWrite = startParallelShell(() => { {_id: "b"}, {writeConcern: {w: "majority"}})); }); -if (isJsonLogNoConn()) { +if (isJsonLog(db.getMongo())) { checkLog.containsJson(db.getMongo(), 20289); } else { checkLog.contains( |