diff options
| author | Randolph Tan <randolph@10gen.com> | 2015-11-20 11:54:07 -0500 |
|---|---|---|
| committer | Randolph Tan <randolph@10gen.com> | 2015-11-23 17:00:03 -0500 |
| commit | 2c790ff83fbe8bd7ec2b627f7597b4e7d576c249 (patch) | |
| tree | d2dc57e0d37c4f3b62eb932cf4e4d7a283828697 | |
| parent | e3cd63fcae3deb1140941a51c85564f098062a23 (diff) | |
| download | mongo-2c790ff83fbe8bd7ec2b627f7597b4e7d576c249.tar.gz | |
SERVER-21588 sharding_legacy_multiversion not using v3.0 mongos
| -rw-r--r-- | buildscripts/resmokeconfig/suites/sharding_legacy_multiversion.yml | 3 | ||||
| -rwxr-xr-x | src/mongo/shell/servers.js | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding_legacy_multiversion.yml b/buildscripts/resmokeconfig/suites/sharding_legacy_multiversion.yml index 503ea3de7d2..142007f45c2 100644 --- a/buildscripts/resmokeconfig/suites/sharding_legacy_multiversion.yml +++ b/buildscripts/resmokeconfig/suites/sharding_legacy_multiversion.yml @@ -37,6 +37,9 @@ selector: - jstests/sharding/movePrimary1.js - jstests/sharding/addshard2.js - jstests/sharding/all_config_hosts_down.js # possibly caused by SERVER-21215? + - jstests/sharding/auth.js + - jstests/sharding/auth_slaveok_routing.js + - jstests/sharding/startup_with_all_configs_down.js executor: js_test: diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js index 6e2825eafca..26d7e091e59 100755 --- a/src/mongo/shell/servers.js +++ b/src/mongo/shell/servers.js @@ -402,7 +402,9 @@ MongoRunner.mongoOptions = function(opts) { } // Normalize and get the binary version to use - opts.binVersion = MongoRunner.getBinVersionFor(opts.binVersion); + if (opts.hasOwnProperty('binVersion')) { + opts.binVersion = MongoRunner.getBinVersionFor(opts.binVersion); + } // Default for waitForConnect is true opts.waitForConnect = |