Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 2 insertions, 6 deletions

diff --git a/jstests/replsets/libs/rollback_test.js b/jstests/replsets/libs/rollback_test.js
index d6838deffcf..5e70cd96614 100644
--- a/jstests/replsets/libs/rollback_test.js
+++ b/jstests/replsets/libs/rollback_test.js
@@ -294,10 +294,6 @@ function RollbackTest(name = "RollbackTest", replSet) {
         return rst.getPrimary(ReplSetTest.kDefaultTimeoutMS, kRetryIntervalMS);
     }
 
-    this.stepUpNode = function(conn) {
-        stepUp(conn);
-    };
-
     function oplogTop(conn) {
         return conn.getDB("local").oplog.rs.find().limit(1).sort({$natural: -1}).next();
     }
@@ -543,11 +539,11 @@ function RollbackTest(name = "RollbackTest", replSet) {
         return curPrimary;
     };
 
-    this.stop = function(checkDataConsistencyOptions, skipDataConsistencyCheck = false) {
+    this.stop = function(checkDataConsistencyOptions) {
         const start = new Date();
         restartServerReplication(tiebreakerNode);
         rst.awaitReplication();
-        if (!doneConsistencyChecks && !skipDataConsistencyCheck) {
+        if (!doneConsistencyChecks) {
             this.checkDataConsistency(checkDataConsistencyOptions);
         }
         transitionIfAllowed(State.kStopped);