1 files changed, 32 insertions, 34 deletions
diff --git a/jstests/sharding/remove1.js b/jstests/sharding/remove1.js
index 8ccf8dadcf2..3c8364382ce 100644
--- a/jstests/sharding/remove1.js
+++ b/jstests/sharding/remove1.js
@@ -1,48 +1,46 @@
 (function() {
-    'use strict';
+'use strict';
 
-    var s = new ShardingTest({shards: 2, other: {enableBalancer: true}});
-    var config = s.s0.getDB('config');
+var s = new ShardingTest({shards: 2, other: {enableBalancer: true}});
+var config = s.s0.getDB('config');
 
-    assert.commandWorked(s.s0.adminCommand({enableSharding: 'needToMove'}));
-    s.ensurePrimaryShard('needToMove', s.shard0.shardName);
+assert.commandWorked(s.s0.adminCommand({enableSharding: 'needToMove'}));
+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"}),
-                                 ErrorCodes.ShardNotFound);
+// Returns an error when trying to remove a shard that doesn't exist.
+assert.commandFailedWithCode(s.s0.adminCommand({removeshard: "shardz"}), ErrorCodes.ShardNotFound);
 
-    // 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: s.shard0.shardName}));
+// 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: s.shard0.shardName}));
 
-    // Can't have more than one draining shard at a time
-    assert.commandFailedWithCode(s.s0.adminCommand({removeshard: s.shard1.shardName}),
-                                 ErrorCodes.ConflictingOperationInProgress);
-    assert.eq(s.s0.adminCommand({removeshard: s.shard0.shardName}).dbsToMove,
-              ['needToMove'],
-              "didn't show db to move");
+// Can't have more than one draining shard at a time
+assert.commandFailedWithCode(s.s0.adminCommand({removeshard: s.shard1.shardName}),
+                             ErrorCodes.ConflictingOperationInProgress);
+assert.eq(s.s0.adminCommand({removeshard: s.shard0.shardName}).dbsToMove,
+          ['needToMove'],
+          "didn't show db to move");
 
-    s.s0.getDB('needToMove').dropDatabase();
+s.s0.getDB('needToMove').dropDatabase();
 
-    // Ensure the balancer moves the config.system.sessions collection chunks out of the shard being
-    // removed
-    s.awaitBalancerRound();
+// Ensure the balancer moves the config.system.sessions collection chunks out of the shard being
+// removed
+s.awaitBalancerRound();
 
-    var removeResult = assert.commandWorked(s.s0.adminCommand({removeshard: s.shard0.shardName}));
-    assert.eq('completed', removeResult.state, 'Shard was not removed: ' + tojson(removeResult));
+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();
-    assert.eq(1,
-              existingShards.length,
-              "Removed server still appears in count: " + tojson(existingShards));
+var existingShards = config.shards.find({}).toArray();
+assert.eq(
+    1, existingShards.length, "Removed server still appears in count: " + tojson(existingShards));
 
-    assert.commandFailed(s.s0.adminCommand({removeshard: s.shard1.shardName}));
+assert.commandFailed(s.s0.adminCommand({removeshard: s.shard1.shardName}));
 
-    // Should create a shard0002 shard
-    var conn = MongoRunner.runMongod({shardsvr: ""});
-    assert.commandWorked(s.s0.adminCommand({addshard: conn.host}));
-    assert.eq(2, s.config.shards.count(), "new server does not appear in count");
+// Should create a shard0002 shard
+var conn = MongoRunner.runMongod({shardsvr: ""});
+assert.commandWorked(s.s0.adminCommand({addshard: conn.host}));
+assert.eq(2, s.config.shards.count(), "new server does not appear in count");
 
-    MongoRunner.stopMongod(conn);
-    s.stop();
+MongoRunner.stopMongod(conn);
+s.stop();
 })();