SERVER-38875 Make tests start shards as replica sets instead of standalones after auth cluster time gossiping fix

6 files changed, 9 insertions, 25 deletions

diff --git a/jstests/ssl/libs/ssl_helpers.js b/jstests/ssl/libs/ssl_helpers.js
index d41fc6b7f10..b2aabd36b7d 100644
--- a/jstests/ssl/libs/ssl_helpers.js
+++ b/jstests/ssl/libs/ssl_helpers.js
@@ -115,7 +115,8 @@ function mixedShardTest(options1, options2, shouldSucceed) {
         // authorized to do if auth is enabled.
         //
         // Once SERVER-14017 is fixed the "enableBalancer" line can be removed.
-        // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+        // TODO: SERVER-43899 Make sharding_with_x509.js and mixed_mode_sharded_transition.js start
+        // shards as replica sets.
         var st = new ShardingTest({
             mongos: [options1],
             config: [options1],
diff --git a/jstests/ssl/sharding_with_x509.js b/jstests/ssl/sharding_with_x509.js
index d52d1e20d17..d00417c24f1 100644
--- a/jstests/ssl/sharding_with_x509.js
+++ b/jstests/ssl/sharding_with_x509.js
@@ -15,7 +15,8 @@ var x509_options = {
 // Start ShardingTest with enableBalancer because ShardingTest attempts to turn off the balancer
 // otherwise, which it will not be authorized to do. Once SERVER-14017 is fixed the
 // "enableBalancer" line could be removed.
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+// TODO: SERVER-43899 Make sharding_with_x509.js and mixed_mode_sharded_transition.js start shards
+// as replica sets.
 var st = new ShardingTest({
     shards: 2,
     mongos: 1,
diff --git a/jstests/ssl/ssl_fragment.js b/jstests/ssl/ssl_fragment.js
index 4e15262e57f..e585b9ac706 100644
--- a/jstests/ssl/ssl_fragment.js
+++ b/jstests/ssl/ssl_fragment.js
@@ -45,17 +45,11 @@ const mongod = MongoRunner.runMongod(options);
 runTest(mongod);
 MongoRunner.stopMongod(mongod);
 
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
 const st = new ShardingTest({
     shards: 3,
     mongos: 1,
     config: 1,
-    other: {
-        configOptions: options,
-        mongosOptions: mongosOptions,
-        shardOptions: options,
-        shardAsReplicaSet: false,
-    }
+    other: {configOptions: options, mongosOptions: mongosOptions, shardOptions: options}
 });
 
 runTest(st.s0);
diff --git a/jstests/ssl/ssl_without_ca.js b/jstests/ssl/ssl_without_ca.js
index 93658ef5ca8..cbc3aaa37f1 100644
--- a/jstests/ssl/ssl_without_ca.js
+++ b/jstests/ssl/ssl_without_ca.js
@@ -42,17 +42,11 @@ assert.isnull(conn, "server started with x509 clusterAuthMode but no CA file");
 
 jsTest.log("Assert mongos doesn\'t start with CA file missing and clusterAuthMode=x509.");
 
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
 assert.throws(function() {
     new ShardingTest({
         shards: 1,
         mongos: 1,
         verbose: 2,
-        other: {
-            configOptions: sslParams,
-            mongosOptions: sslParams,
-            shardOptions: sslParams,
-            shardAsReplicaSet: false
-        }
+        other: {configOptions: sslParams, mongosOptions: sslParams, shardOptions: sslParams}
     });
 }, [], "mongos started with x509 clusterAuthMode but no CA file");
diff --git a/jstests/ssl/ssl_x509_roles.js b/jstests/ssl/ssl_x509_roles.js
index eb5bba46ab6..a0097bb5978 100644
--- a/jstests/ssl/ssl_x509_roles.js
+++ b/jstests/ssl/ssl_x509_roles.js
@@ -108,7 +108,6 @@ jsTestLog("2. Testing disabling x.509 auth with roles");
 
 print("3. Testing x.509 auth to mongos");
 {
-    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
     let st = new ShardingTest({
         shards: 1,
         mongos: 1,
@@ -117,8 +116,7 @@ print("3. Testing x.509 auth to mongos");
             configOptions: x509_options,
             mongosOptions: x509_options,
             shardOptions: x509_options,
-            useHostname: false,
-            shardAsReplicaSet: false
+            useHostname: false
         }
     });
 
@@ -131,7 +129,6 @@ print("4. Testing x.509 auth to mongos with x509 roles disabled");
 {
     const localOptions =
         Object.merge(x509_options, {setParameter: "allowRolesFromX509Certificates=false"});
-    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
     let st = new ShardingTest({
         shards: 1,
         mongos: 1,
@@ -140,8 +137,7 @@ print("4. Testing x.509 auth to mongos with x509 roles disabled");
             configOptions: localOptions,
             mongosOptions: localOptions,
             shardOptions: localOptions,
-            useHostname: false,
-            shardAsReplicaSet: false
+            useHostname: false
         }
     });
 
diff --git a/jstests/ssl/x509_client.js b/jstests/ssl/x509_client.js
index a9ec1c01dbc..595b063b1a8 100644
--- a/jstests/ssl/x509_client.js
+++ b/jstests/ssl/x509_client.js
@@ -100,7 +100,6 @@ MongoRunner.stopMongod(mongo);
 
 print("2. Testing x.509 auth to mongos");
 
-// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
 var st = new ShardingTest({
     shards: 1,
     mongos: 1,
@@ -109,8 +108,7 @@ var st = new ShardingTest({
         configOptions: x509_options,
         mongosOptions: x509_options,
         shardOptions: x509_options,
-        useHostname: false,
-        shardAsReplicaSet: false
+        useHostname: false
     }
 });