diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2016-06-15 17:14:53 -0400 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2016-06-20 22:15:57 -0400 |
commit | b6abb408c175b4311ef65ee18da3c15f236bd3fa (patch) | |
tree | 188163a6d5bdf95ea00d3cb09c8607fc369b9355 /jstests/multiVersion | |
parent | 42f4b9849826f93125dbb71c56158eb0cbc0f401 (diff) | |
download | mongo-b6abb408c175b4311ef65ee18da3c15f236bd3fa.tar.gz |
SERVER-24603 Re-enable auth tests in 'sharding_last_stable_mongos'
This change makes auth tests with 3.2 mongos, which need to control the
balancer state to go through a special control mongos instance running
version 3.4.
This reverts commit bfde0ecb1ca31c35a37f90a7706987acc0c217f7.
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(); |