1 files changed, 35 insertions, 78 deletions

diff --git a/jstests/sharding/sharding_options.js b/jstests/sharding/sharding_options.js
index 7fe34a0c140..0841967b18e 100644
--- a/jstests/sharding/sharding_options.js
+++ b/jstests/sharding/sharding_options.js
@@ -2,142 +2,99 @@ var baseName = "jstests_sharding_sharding_options";
 
 load('jstests/libs/command_line/test_parsed_options.js');
 
-
-
 // Move Paranoia
 jsTest.log("Testing \"moveParanoia\" command line option");
 var expectedResult = {
-    "parsed" : {
-        "sharding" : {
-            "archiveMovedChunks" : true
-        }
-    }
+    "parsed": {"sharding": {"archiveMovedChunks": true}}
 };
-testGetCmdLineOptsMongod({ moveParanoia : "" }, expectedResult);
+testGetCmdLineOptsMongod({moveParanoia: ""}, expectedResult);
 
 jsTest.log("Testing \"noMoveParanoia\" command line option");
 expectedResult = {
-    "parsed" : {
-        "sharding" : {
-            "archiveMovedChunks" : false
-        }
-    }
+    "parsed": {"sharding": {"archiveMovedChunks": false}}
 };
-testGetCmdLineOptsMongod({ noMoveParanoia : "" }, expectedResult);
+testGetCmdLineOptsMongod({noMoveParanoia: ""}, expectedResult);
 
 jsTest.log("Testing \"sharding.archiveMovedChunks\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/enable_paranoia.json",
-        "sharding" : {
-            "archiveMovedChunks" : true
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/enable_paranoia.json",
+        "sharding": {"archiveMovedChunks": true}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/enable_paranoia.json" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/enable_paranoia.json"},
                          expectedResult);
 
-
-
 // Sharding Role
 jsTest.log("Testing \"configsvr\" command line option");
 var expectedResult = {
-    "parsed" : {
-        "sharding" : {
-            "clusterRole" : "configsvr"
-        },
-        "storage" : {
-            "journal" : {
-                "enabled" : true
-            }
-        }
-    }
+    "parsed":
+        {"sharding": {"clusterRole": "configsvr"}, "storage": {"journal": {"enabled": true}}}
 };
-testGetCmdLineOptsMongod({ configsvr : "", journal: "" }, expectedResult);
+testGetCmdLineOptsMongod({configsvr: "", journal: ""}, expectedResult);
 
 jsTest.log("Testing \"shardsvr\" command line option");
 expectedResult = {
-    "parsed" : {
-        "sharding" : {
-            "clusterRole" : "shardsvr"
-        }
-    }
+    "parsed": {"sharding": {"clusterRole": "shardsvr"}}
 };
-testGetCmdLineOptsMongod({ shardsvr : "" }, expectedResult);
+testGetCmdLineOptsMongod({shardsvr: ""}, expectedResult);
 
 jsTest.log("Testing \"sharding.clusterRole\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/set_shardingrole.json",
-        "sharding" : {
-            "clusterRole" : "configsvr"
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/set_shardingrole.json",
+        "sharding": {"clusterRole": "configsvr"}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/set_shardingrole.json" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/set_shardingrole.json"},
                          expectedResult);
 
-
-
 // Auto Splitting
 jsTest.log("Testing \"noAutoSplit\" command line option");
 var expectedResult = {
-    "parsed" : {
-        "sharding" : {
-            "autoSplit" : false
-        }
-    }
+    "parsed": {"sharding": {"autoSplit": false}}
 };
-testGetCmdLineOptsMongos({ noAutoSplit : "" }, expectedResult);
+testGetCmdLineOptsMongos({noAutoSplit: ""}, expectedResult);
 
 jsTest.log("Testing \"sharding.autoSplit\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/enable_autosplit.json",
-        "sharding" : {
-            "autoSplit" : true
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/enable_autosplit.json",
+        "sharding": {"autoSplit": true}
     }
 };
-testGetCmdLineOptsMongos({ config : "jstests/libs/config_files/enable_autosplit.json" },
+testGetCmdLineOptsMongos({config: "jstests/libs/config_files/enable_autosplit.json"},
                          expectedResult);
 
 // Test that we preserve switches explicitly set to false in config files.  See SERVER-13439.
 jsTest.log("Testing explicitly disabled \"moveParanoia\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_moveparanoia.ini",
-        "sharding" : {
-            "archiveMovedChunks" : false
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/disable_moveparanoia.ini",
+        "sharding": {"archiveMovedChunks": false}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_moveparanoia.ini" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/disable_moveparanoia.ini"},
                          expectedResult);
 
 jsTest.log("Testing explicitly disabled \"noMoveParanoia\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_nomoveparanoia.ini",
-        "sharding" : {
-            "archiveMovedChunks" : true
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/disable_nomoveparanoia.ini",
+        "sharding": {"archiveMovedChunks": true}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_nomoveparanoia.ini" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/disable_nomoveparanoia.ini"},
                          expectedResult);
 
 jsTest.log("Testing explicitly disabled \"noAutoSplit\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_noautosplit.ini",
-        "sharding" : {
-            "autoSplit" : true
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/disable_noautosplit.ini",
+        "sharding": {"autoSplit": true}
     }
 };
-testGetCmdLineOptsMongos({ config : "jstests/libs/config_files/disable_noautosplit.ini" },
+testGetCmdLineOptsMongos({config: "jstests/libs/config_files/disable_noautosplit.ini"},
                          expectedResult);
 
-
 print(baseName + " succeeded.");