SERVER-32052 Update ShardingTest to default to starting shard servers as replica sets

1 files changed, 4 insertions, 3 deletions

diff --git a/jstests/sharding/startup_with_all_configs_down.js b/jstests/sharding/startup_with_all_configs_down.js
index cef9ec46327..72ff9238bfc 100644
--- a/jstests/sharding/startup_with_all_configs_down.js
+++ b/jstests/sharding/startup_with_all_configs_down.js
@@ -23,7 +23,8 @@ TestData.skipCheckingUUIDsConsistentAcrossCluster = true;
         MongoRunner.runMongod(shard);
     }
 
-    var st = new ShardingTest({shards: 2});
+    // TODO: SERVER-33444 remove shardAsReplicaSet: false
+    var st = new ShardingTest({shards: 2, other: {shardAsReplicaSet: false}});
 
     jsTestLog("Setting up initial data");
 
@@ -32,12 +33,12 @@ TestData.skipCheckingUUIDsConsistentAcrossCluster = true;
     }
 
     assert.commandWorked(st.s0.adminCommand({enableSharding: 'test'}));
-    st.ensurePrimaryShard('test', 'shard0000');
+    st.ensurePrimaryShard('test', st.shard0.shardName);
 
     assert.commandWorked(st.s0.adminCommand({shardCollection: 'test.foo', key: {_id: 1}}));
     assert.commandWorked(st.s0.adminCommand({split: 'test.foo', find: {_id: 50}}));
     assert.commandWorked(
-        st.s0.adminCommand({moveChunk: 'test.foo', find: {_id: 75}, to: 'shard0001'}));
+        st.s0.adminCommand({moveChunk: 'test.foo', find: {_id: 75}, to: st.shard1.shardName}));
 
     // Make sure the pre-existing mongos already has the routing information loaded into memory
     assert.eq(100, st.s.getDB('test').foo.find().itcount());