1 files changed, 52 insertions, 43 deletions
diff --git a/jstests/sharding/geo_near_random2.js b/jstests/sharding/geo_near_random2.js
index cc566607113..cdf8543274a 100644
--- a/jstests/sharding/geo_near_random2.js
+++ b/jstests/sharding/geo_near_random2.js
@@ -1,50 +1,59 @@
 // This tests 1% of all points using $near and $nearSphere
 (function() {
 
-load("jstests/libs/geo_near_random.js");
-
-var testName = "geo_near_random2";
-var s = new ShardingTest({ name: testName, shards: 3 });
-
-db = s.getDB("test"); // global db
-
-var test = new GeoNearRandomTest(testName);
-
-s.adminCommand({enablesharding:'test'});
-s.ensurePrimaryShard('test', 'shard0001');
-s.adminCommand({shardcollection: ('test.' + testName), key: {_id:1} });
-
-test.insertPts(5000);
-
-for (var i = (test.nPts/10); i < test.nPts; i+= (test.nPts/10)){
-    s.adminCommand({split: ('test.' + testName), middle: {_id: i} });
-    try {
-        s.adminCommand({moveChunk: ('test.' + testName), find: {_id: i-1}, to: ('shard000' + (i%3)), _waitForDelete : true });
-    } catch (e) {
-        // ignore this error
-        if (! e.message.match(/that chunk is already on that shard/)){
-            throw e;
+    load("jstests/libs/geo_near_random.js");
+
+    var testName = "geo_near_random2";
+    var s = new ShardingTest({name: testName, shards: 3});
+
+    db = s.getDB("test");  // global db
+
+    var test = new GeoNearRandomTest(testName);
+
+    s.adminCommand({enablesharding: 'test'});
+    s.ensurePrimaryShard('test', 'shard0001');
+    s.adminCommand({shardcollection: ('test.' + testName), key: {_id: 1}});
+
+    test.insertPts(5000);
+
+    for (var i = (test.nPts / 10); i < test.nPts; i += (test.nPts / 10)) {
+        s.adminCommand({split: ('test.' + testName), middle: {_id: i}});
+        try {
+            s.adminCommand({
+                moveChunk: ('test.' + testName),
+                find: {_id: i - 1},
+                to: ('shard000' + (i % 3)),
+                _waitForDelete: true
+            });
+        } catch (e) {
+            // ignore this error
+            if (!e.message.match(/that chunk is already on that shard/)) {
+                throw e;
+            }
         }
     }
-}
-
-//Turn balancer back on, for actual tests
-// s.startBalancer(); // SERVER-13365
-
-opts = {sphere:0, nToTest:test.nPts*0.01, sharded:true}; 
-test.testPt([0,0], opts);
-test.testPt(test.mkPt(), opts);
-test.testPt(test.mkPt(), opts);
-test.testPt(test.mkPt(), opts);
-test.testPt(test.mkPt(), opts);
-
-opts.sphere = 1;
-test.testPt([0,0], opts);
-test.testPt(test.mkPt(0.8), opts);
-test.testPt(test.mkPt(0.8), opts);
-test.testPt(test.mkPt(0.8), opts);
-test.testPt(test.mkPt(0.8), opts);
-
-s.stop();
+
+    // Turn balancer back on, for actual tests
+    // s.startBalancer(); // SERVER-13365
+
+    opts = {
+        sphere: 0,
+        nToTest: test.nPts * 0.01,
+        sharded: true
+    };
+    test.testPt([0, 0], opts);
+    test.testPt(test.mkPt(), opts);
+    test.testPt(test.mkPt(), opts);
+    test.testPt(test.mkPt(), opts);
+    test.testPt(test.mkPt(), opts);
+
+    opts.sphere = 1;
+    test.testPt([0, 0], opts);
+    test.testPt(test.mkPt(0.8), opts);
+    test.testPt(test.mkPt(0.8), opts);
+    test.testPt(test.mkPt(0.8), opts);
+    test.testPt(test.mkPt(0.8), opts);
+
+    s.stop();
 
 })();