SERVER-21009 Get rid of some unused/unnecessary methods in ShardingTest

Removes shardGo in lieu of shardColl and removes setBalancer because it
duplicates functionality, which is already in sh.

1 files changed, 6 insertions, 5 deletions

diff --git a/jstests/multiVersion/upgrade_cluster_v5_to_v6.js b/jstests/multiVersion/upgrade_cluster_v5_to_v6.js
index 239c58bfbfb..aea6bda3e6b 100644
--- a/jstests/multiVersion/upgrade_cluster_v5_to_v6.js
+++ b/jstests/multiVersion/upgrade_cluster_v5_to_v6.js
@@ -2,8 +2,10 @@
  * Tests upgrading a cluster which has 3.0 mongos.
  */
 
-load( './jstests/multiVersion/libs/multi_rs.js' )
-load( './jstests/multiVersion/libs/multi_cluster.js' )
+load('./jstests/multiVersion/libs/multi_rs.js');
+load('./jstests/multiVersion/libs/multi_cluster.js');
+
+(function() {
 
 /**
  * @param isRSCluster {bool} use replica set shards.
@@ -29,9 +31,6 @@ var options = {
 
 var st = new ShardingTest({ shards : 2, mongos : 2, other : options });
 
-// Just stop balancer, to simulate race conds
-st.setBalancer(false);
-
 var shards = st.s0.getDB("config").shards.find().toArray();
 var configConnStr = st._configDB;
 
@@ -124,3 +123,5 @@ st.stop();
 
 runTest(false);
 runTest(true);
+
+})();