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, 8 insertions, 3 deletions

diff --git a/jstests/slow1/sharding_multiple_collections.js b/jstests/slow1/sharding_multiple_collections.js
index 922087ba2aa..ca13cbc3c40 100644
--- a/jstests/slow1/sharding_multiple_collections.js
+++ b/jstests/slow1/sharding_multiple_collections.js
@@ -1,6 +1,10 @@
-// multcollections.js
+(function() {
 
-s = new ShardingTest( "multcollections" , 2 , 1 , 1 , { chunksize : 1, enableBalancer : true }  );
+var s = new ShardingTest({ name: "multcollections",
+                           shards: 2,
+                           mongos: 1,
+                           verbose: 1,
+                           other: { chunkSize: 1, enableBalancer : true } });
 
 s.adminCommand( { enablesharding : "test" } );
 db = s.getDB( "test" )
@@ -52,5 +56,6 @@ while ( 1 ){
         break
 }
 
-s.stop()
+s.stop();
 
+})();