SERVER-20530 enable useClusterClientCursor code path for fixed jstests

4 files changed, 3 insertions, 12 deletions

diff --git a/jstests/sharding/authConnectionHook.js b/jstests/sharding/authConnectionHook.js
index 9255bbe9ecd..e13c04dc73c 100644
--- a/jstests/sharding/authConnectionHook.js
+++ b/jstests/sharding/authConnectionHook.js
@@ -16,9 +16,6 @@ st.ensurePrimaryShard('test', 'shard0001');
 adminDB.runCommand({shardCollection : "test.foo", key : {x : 1}});
 st.stopBalancer();
 
-// TODO: SERVER-20194. This test forces use of the old mongos query path.
-assert.commandWorked(adminDB.runCommand({setParameter: 1, useClusterClientCursor: false}));
-
 for (var i = 0; i < 100; i++) {
     db.foo.insert({x:i});
 }
diff --git a/jstests/sharding/auto2.js b/jstests/sharding/auto2.js
index f803f4000f7..ff4c44b2b4f 100644
--- a/jstests/sharding/auto2.js
+++ b/jstests/sharding/auto2.js
@@ -6,6 +6,9 @@ s.adminCommand( { enablesharding : "test" } );
 s.ensurePrimaryShard('test', 'shard0001');
 s.adminCommand( { shardcollection : "test.foo" , key : { num : 1 } } );
 
+// TODO: SERVER-20194. This test forces use of the old mongos query path.
+assert.commandWorked(s.s0.adminCommand({setParameter: 1, useClusterClientCursor: false}));
+
 bigString = "";
 while ( bigString.length < 1024 * 50 )
     bigString += "asocsancdnsjfnsdnfsjdhfasdfasdfasdfnsadofnsadlkfnsaldknfsad";
diff --git a/jstests/sharding/coll_epoch_test1.js b/jstests/sharding/coll_epoch_test1.js
index 70571255e62..3fd97e8105f 100644
--- a/jstests/sharding/coll_epoch_test1.js
+++ b/jstests/sharding/coll_epoch_test1.js
@@ -4,11 +4,6 @@ var st = new ShardingTest({ shards : 3, mongos : 3, verbose : 1 })
 // Stop balancer, it'll interfere
 st.stopBalancer()
 
-// TODO: SERVER-20194. This test forces use of the old mongos query path.
-assert.commandWorked(st.s0.adminCommand({setParameter: 1, useClusterClientCursor: false}));
-assert.commandWorked(st.s1.adminCommand({setParameter: 1, useClusterClientCursor: false}));
-assert.commandWorked(st.s2.adminCommand({setParameter: 1, useClusterClientCursor: false}));
-
 // Use separate mongoses for admin, inserting data, and validating results, so no
 // single-mongos tricks will work
 var insertMongos = st.s2
diff --git a/jstests/sharding/csrs_upgrade.js b/jstests/sharding/csrs_upgrade.js
index 88a48f89a75..f0428081a67 100644
--- a/jstests/sharding/csrs_upgrade.js
+++ b/jstests/sharding/csrs_upgrade.js
@@ -88,10 +88,6 @@ var st;
         }
     });
 
-    // TODO: SERVER-20194. This test forces use of the old mongos query path.
-    assert.commandWorked(st.s0.adminCommand({setParameter: 1, useClusterClientCursor: false}));
-    assert.commandWorked(st.s1.adminCommand({setParameter: 1, useClusterClientCursor: false}));
-
     var shardConfigs = st.s0.getCollection("config.shards").find().toArray();
     assert.eq(2, shardConfigs.length);
     var shard0Name = shardConfigs[0]._id;