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

1 files changed, 6 insertions, 6 deletions

diff --git a/jstests/sharding/remove1.js b/jstests/sharding/remove1.js
index 27f6e1e4a75..d810c9380a0 100644
--- a/jstests/sharding/remove1.js
+++ b/jstests/sharding/remove1.js
@@ -5,7 +5,7 @@
     var config = s.s0.getDB('config');
 
     assert.commandWorked(s.s0.adminCommand({enableSharding: 'needToMove'}));
-    s.ensurePrimaryShard('needToMove', 'shard0000');
+    s.ensurePrimaryShard('needToMove', s.shard0.shardName);
 
     // Returns an error when trying to remove a shard that doesn't exist.
     assert.commandFailedWithCode(s.s0.adminCommand({removeshard: "shardz"}),
@@ -13,12 +13,12 @@
 
     // First remove puts in draining mode, the second tells me a db needs to move, the third
     // actually removes
-    assert.commandWorked(s.s0.adminCommand({removeshard: "shard0000"}));
+    assert.commandWorked(s.s0.adminCommand({removeshard: s.shard0.shardName}));
 
     // Can't have more than one draining shard at a time
-    assert.commandFailedWithCode(s.s0.adminCommand({removeshard: "shard0001"}),
+    assert.commandFailedWithCode(s.s0.adminCommand({removeshard: s.shard1.shardName}),
                                  ErrorCodes.ConflictingOperationInProgress);
-    assert.eq(s.s0.adminCommand({removeshard: "shard0000"}).dbsToMove,
+    assert.eq(s.s0.adminCommand({removeshard: s.shard0.shardName}).dbsToMove,
               ['needToMove'],
               "didn't show db to move");
 
@@ -28,7 +28,7 @@
     // removed
     s.awaitBalancerRound();
 
-    var removeResult = assert.commandWorked(s.s0.adminCommand({removeshard: "shard0000"}));
+    var removeResult = assert.commandWorked(s.s0.adminCommand({removeshard: s.shard0.shardName}));
     assert.eq('completed', removeResult.state, 'Shard was not removed: ' + tojson(removeResult));
 
     var existingShards = config.shards.find({}).toArray();
@@ -36,7 +36,7 @@
               existingShards.length,
               "Removed server still appears in count: " + tojson(existingShards));
 
-    assert.commandFailed(s.s0.adminCommand({removeshard: "shard0001"}));
+    assert.commandFailed(s.s0.adminCommand({removeshard: s.shard1.shardName}));
 
     // Should create a shard0002 shard
     var conn = MongoRunner.runMongod({});