summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Seyster <justin.seyster@mongodb.com>2018-09-14 23:54:41 -0400
committerJustin Seyster <justin.seyster@mongodb.com>2018-10-15 17:44:14 -0400
commitff390f3b6fad40301d13ebb001d2f0a3caeca696 (patch)
tree586159d58d3c6f7330ae8a41d6f7867776fb3939
parent16fd97940c6500906e5daf0765f479e0204a8250 (diff)
downloadmongo-ff390f3b6fad40301d13ebb001d2f0a3caeca696.tar.gz
SERVER-36435 Remove kReplDefaultTimeoutMS.
Tests should, generally, not be accessing global const values like kReplDefaultTimeoutMS. This change removes that const.
-rw-r--r--src/mongo/shell/replsettest.js12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js
index 4ebbc0198d3..0e677ee79b1 100644
--- a/src/mongo/shell/replsettest.js
+++ b/src/mongo/shell/replsettest.js
@@ -64,9 +64,6 @@
* nodes {Array.<Mongo>} - connection to replica set members
*/
-/* Global default timeout variable */
-const kReplDefaultTimeoutMS = 10 * 60 * 1000;
-
var ReplSetTest = function(opts) {
'use strict';
@@ -91,7 +88,9 @@ var ReplSetTest = function(opts) {
var _causalConsistency;
- this.kDefaultTimeoutMS = kReplDefaultTimeoutMS;
+ // Some code still references kDefaultTimeoutMS as a (non-static) member variable, so make sure
+ // it's still accessible that way.
+ this.kDefaultTimeoutMS = ReplSetTest.kDefaultTimeoutMS;
var oplogName = 'oplog.rs';
// Publicly exposed variables
@@ -1905,10 +1904,9 @@ var ReplSetTest = function(opts) {
};
/**
- * Declare kDefaultTimeoutMS as a static property so we don't have to initialize
- * a ReplSetTest object to use it.
+ * Global default timeout (10 minutes).
*/
-ReplSetTest.kDefaultTimeoutMS = kReplDefaultTimeoutMS;
+ReplSetTest.kDefaultTimeoutMS = 10 * 60 * 1000;
/**
* Set of states that the replica set can be in. Used for the wait functions.