diff options
Diffstat (limited to 'jstests/multiVersion')
| -rw-r--r-- | jstests/multiVersion/dumprestore_sharded.js | 2 | ||||
| -rw-r--r-- | jstests/multiVersion/upgrade_cluster.js | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/jstests/multiVersion/dumprestore_sharded.js b/jstests/multiVersion/dumprestore_sharded.js index dd916164b0c..8f3c61d3f2d 100644 --- a/jstests/multiVersion/dumprestore_sharded.js +++ b/jstests/multiVersion/dumprestore_sharded.js @@ -1,5 +1,3 @@ -// dumprestore_sharded.js - load('./jstests/multiVersion/libs/dumprestore_helpers.js'); // The base name to use for various things in the test, including the dbpath and the database name diff --git a/jstests/multiVersion/upgrade_cluster.js b/jstests/multiVersion/upgrade_cluster.js index 033df67611e..046c6d12976 100644 --- a/jstests/multiVersion/upgrade_cluster.js +++ b/jstests/multiVersion/upgrade_cluster.js @@ -15,17 +15,6 @@ load('./jstests/multiVersion/libs/multi_cluster.js'); jsTest.log("Starting" + (isRSCluster ? " (replica set)" : "") + " cluster" + "..."); - var options = { - mongosOptions: {binVersion: "last-stable"}, - configOptions: {binVersion: "last-stable"}, - shardOptions: {binVersion: "last-stable"}, - - rsOptions: {binVersion: "last-stable"}, - rs: isRSCluster, - // TODO: SERVER-24163 remove after v3.4 - waitForCSRSSecondaries: false - }; - var testCRUD = function(mongos) { assert.commandWorked(mongos.getDB('test').runCommand({dropDatabase: 1})); assert.commandWorked(mongos.getDB('unsharded').runCommand({dropDatabase: 1})); @@ -56,7 +45,20 @@ load('./jstests/multiVersion/libs/multi_cluster.js'); assert.eq(null, doc); }; - var st = new ShardingTest({shards: 2, mongos: 1, other: options}); + var st = new ShardingTest({ + shards: 2, + mongos: 1, + other: { + mongosOptions: {binVersion: "last-stable"}, + configOptions: {binVersion: "last-stable"}, + shardOptions: {binVersion: "last-stable"}, + + rsOptions: {binVersion: "last-stable"}, + rs: isRSCluster, + // TODO: SERVER-24163 remove after v3.4 + waitForCSRSSecondaries: false + } + }); st.configRS.awaitReplication(); var version = st.s.getCollection('config.version').findOne(); |