SERVER-21009 Remove usages of the multi-argument ShardingTest constructor

No functional changes, just converting everything to use the JSON-based
constructor.

Also moves some sharding-specific tests out of noPassthroughWithMongod and
under the sharding suite.

1 files changed, 7 insertions, 4 deletions

diff --git a/jstests/sharding/shard_keycount.js b/jstests/sharding/shard_keycount.js
index 408774785c8..5702b59dc84 100644
--- a/jstests/sharding/shard_keycount.js
+++ b/jstests/sharding/shard_keycount.js
@@ -1,9 +1,10 @@
 // Tests splitting a chunk twice
+(function() {
 
-s = new ShardingTest( "shard_keycount" , 2, 0, 1, /* chunkSize */1);
-
-// Kill balancer
-s.config.settings.update({ _id: "balancer" }, { $set : { stopped: true } }, true )
+var s = new ShardingTest({ name: "shard_keycount",
+                           shards: 2,
+                           mongos: 1,
+                           other:{ chunkSize: 1 } });
 
 dbName = "test"
 collName = "foo"
@@ -45,3 +46,5 @@ coll.update({ _id : 3 }, { _id : 3 })
 s.adminCommand({ split : ns, find : { _id : 3 } })
 
 s.stop();
+
+});