diff options
| author | Randolph Tan <randolph@10gen.com> | 2014-03-20 16:33:12 -0400 |
|---|---|---|
| committer | Randolph Tan <randolph@10gen.com> | 2014-03-20 19:52:35 -0400 |
| commit | 69ec3ce065a4ef0695bd36a7da224717a5aea458 (patch) | |
| tree | 5ab04778b2c89a38ee36e82ce4e7ffc757055764 | |
| parent | 06af0c0546c1ded643ece9daae60fcf7f2957d66 (diff) | |
| download | mongo-69ec3ce065a4ef0695bd36a7da224717a5aea458.tar.gz | |
SERVER-13294 mongos --upgrade should exit after upgrading
Fix multiVersion tests
(cherry picked from commit 6e5c3296a9c8001307176f58fec0e632d0beebd0)
| -rw-r--r-- | jstests/multiVersion/auth_schema_upgrade_26.js | 4 | ||||
| -rw-r--r-- | jstests/multiVersion/upgrade_cluster_v4_to_v5.js | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/jstests/multiVersion/auth_schema_upgrade_26.js b/jstests/multiVersion/auth_schema_upgrade_26.js index f5653485bce..76050b05752 100644 --- a/jstests/multiVersion/auth_schema_upgrade_26.js +++ b/jstests/multiVersion/auth_schema_upgrade_26.js @@ -150,8 +150,8 @@ load('jstests/multiVersion/libs/multi_rs.js'); upgrade : "", keyFile: keyfile }); - assert.neq(null, mongos); - MongoRunner.stopMongos(mongos); + assert.eq(null, mongos); + shardingTest.upgradeCluster(newVersion, { upgradeMetadata: true }); asClusterAdmin(shardingTest.config.getMongo(), function restartBalancerAsAdmin() { shardingTest.startBalancer(); diff --git a/jstests/multiVersion/upgrade_cluster_v4_to_v5.js b/jstests/multiVersion/upgrade_cluster_v4_to_v5.js index 173a0b04d96..365dc2c53e7 100644 --- a/jstests/multiVersion/upgrade_cluster_v4_to_v5.js +++ b/jstests/multiVersion/upgrade_cluster_v4_to_v5.js @@ -102,8 +102,7 @@ mongos = MongoRunner.runMongos({ binVersion : "2.6", configdb : configConnStr }) assert.eq(null, mongos); mongos = MongoRunner.runMongos({ binVersion : "2.6", configdb : configConnStr, upgrade : "" }); -assert.neq(null, mongos); -MongoRunner.stopMongos(mongos); +assert.eq(null, mongos); jsTest.log("2.6 mongoses started in 2.4 cluster."); |