From e55c4b224f1260e4d163be7a71db2737be298559 Mon Sep 17 00:00:00 2001
From: Spencer Jackson <spencer.jackson@mongodb.com>
Date: Tue, 13 Dec 2016 17:53:24 -0500
Subject: SERVER-26525: Factor out identical checkLog functions

---
 jstests/sharding/config_version_rollback.js | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'jstests/sharding/config_version_rollback.js')

diff --git a/jstests/sharding/config_version_rollback.js b/jstests/sharding/config_version_rollback.js
index 2fc5d78c8fc..bb066b8cc80 100644
--- a/jstests/sharding/config_version_rollback.js
+++ b/jstests/sharding/config_version_rollback.js
@@ -6,23 +6,7 @@
 
 (function() {
     "use strict";
-
-    // Wait for fail point message to be logged.
-    var checkLog = function(node, msg) {
-        assert.soon(
-            function() {
-                var logMessages = assert.commandWorked(node.adminCommand({getLog: 'global'})).log;
-                for (var i = 0; i < logMessages.length; i++) {
-                    if (logMessages[i].indexOf(msg) != -1) {
-                        return true;
-                    }
-                }
-                return false;
-            },
-            'Did not see a log entry for ' + node + ' containing the following message: ' + msg,
-            60000,
-            1000);
-    };
+    load("jstests/libs/check_log.js");
 
     // The config.version document is written on transition to primary. We need to ensure this
     // config.version document is rolled back for this test.
@@ -70,7 +54,7 @@
 
     // Ensure the primary is waiting to write the config.version document before stopping the oplog
     // fetcher on the secondaries.
-    checkLog(
+    checkLog.contains(
         origPriConn,
         'transition to primary - transitionToPrimaryHangBeforeInitializingConfigDatabase fail point enabled.');
 
-- 
cgit v1.2.1