From b6abb408c175b4311ef65ee18da3c15f236bd3fa Mon Sep 17 00:00:00 2001 From: Kaloian Manassiev Date: Wed, 15 Jun 2016 17:14:53 -0400 Subject: 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. --- jstests/multiVersion/upgrade_cluster.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'jstests/multiVersion/upgrade_cluster.js') 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(); -- cgit v1.2.1