SERVER-22468 Format JS code with approved style in jstests/

3 files changed, 73 insertions, 176 deletions

diff --git a/jstests/httpinterface/httpinterface.js b/jstests/httpinterface/httpinterface.js
index 38ca96b6be6..dc21422ff46 100644
--- a/jstests/httpinterface/httpinterface.js
+++ b/jstests/httpinterface/httpinterface.js
@@ -4,21 +4,21 @@ var httpPort = conn.port + 1000;
 
 tryHttp = function() {
     try {
-        var mongo = new Mongo('localhost:' + httpPort) ;
-    }
-    catch (e) {
+        var mongo = new Mongo('localhost:' + httpPort);
+    } catch (e) {
         return false;
     }
     // if we managed to start and connect a new mongo then the web interface is working
     return true;
 };
 
-assert.throws(function() {assert.soon(tryHttp, "tryHttp failed, like we expected it to");});
+assert.throws(function() {
+    assert.soon(tryHttp, "tryHttp failed, like we expected it to");
+});
 
 MongoRunner.stopMongod(conn);
 
 conn = MongoRunner.runMongod({port: conn.port, smallfiles: "", httpinterface: ""});
-assert.soon(tryHttp,
-            "the web interface should be running on " + httpPort);
+assert.soon(tryHttp, "the web interface should be running on " + httpPort);
 
 MongoRunner.stopMongod(conn);
diff --git a/jstests/httpinterface/network_options.js b/jstests/httpinterface/network_options.js
index 33f117f980b..0302c9ac15b 100644
--- a/jstests/httpinterface/network_options.js
+++ b/jstests/httpinterface/network_options.js
@@ -7,284 +7,185 @@ load('jstests/libs/command_line/test_parsed_options.js');
 // Object Check
 jsTest.log("Testing \"objcheck\" command line option");
 var expectedResult = {
-    "parsed" : {
-        "net" : {
-            "wireObjectCheck" : true
-        }
-    }
+    "parsed": {"net": {"wireObjectCheck": true}}
 };
-testGetCmdLineOptsMongod({ objcheck : "" }, expectedResult);
+testGetCmdLineOptsMongod({objcheck: ""}, expectedResult);
 
 jsTest.log("Testing \"noobjcheck\" command line option");
 expectedResult = {
-    "parsed" : {
-        "net" : {
-            "wireObjectCheck" : false
-        }
-    }
+    "parsed": {"net": {"wireObjectCheck": false}}
 };
-testGetCmdLineOptsMongod({ noobjcheck : "" }, expectedResult);
+testGetCmdLineOptsMongod({noobjcheck: ""}, expectedResult);
 
 jsTest.log("Testing \"net.wireObjectCheck\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/enable_objcheck.json",
-        "net" : {
-            "wireObjectCheck" : true
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/enable_objcheck.json",
+        "net": {"wireObjectCheck": true}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/enable_objcheck.json" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/enable_objcheck.json"},
                          expectedResult);
 
 jsTest.log("Testing with no explicit network option setting");
 expectedResult = {
-    "parsed" : {
-        "net" : { }
-    }
+    "parsed": {"net": {}}
 };
 testGetCmdLineOptsMongod({}, expectedResult);
 
-
-
 // HTTP Interface
 jsTest.log("Testing \"httpinterface\" command line option");
 var expectedResult = {
-    "parsed" : {
-        "net" : {
-            "http" : {
-                "enabled" : true
-            }
-        }
-    }
+    "parsed": {"net": {"http": {"enabled": true}}}
 };
-testGetCmdLineOptsMongod({ httpinterface : "" }, expectedResult);
+testGetCmdLineOptsMongod({httpinterface: ""}, expectedResult);
 
 jsTest.log("Testing \"nohttpinterface\" command line option");
 expectedResult = {
-    "parsed" : {
-        "net" : {
-            "http" : {
-                "enabled" : false
-            }
-        }
-    }
+    "parsed": {"net": {"http": {"enabled": false}}}
 };
-testGetCmdLineOptsMongod({ nohttpinterface : "" }, expectedResult);
+testGetCmdLineOptsMongod({nohttpinterface: ""}, expectedResult);
 
 jsTest.log("Testing implicit enabling of http interface with \"jsonp\" command line option");
 expectedResult = {
-    "parsed" : {
-        "net" : {
-            "http" : {
-                "JSONPEnabled" : true,
-                "enabled" : true
-            }
-        }
-    }
+    "parsed": {"net": {"http": {"JSONPEnabled": true, "enabled": true}}}
 };
-testGetCmdLineOptsMongod({ jsonp : "" }, expectedResult);
+testGetCmdLineOptsMongod({jsonp: ""}, expectedResult);
 
 jsTest.log("Testing implicit enabling of http interface with \"rest\" command line option");
 expectedResult = {
-    "parsed" : {
-        "net" : {
-            "http" : {
-                "RESTInterfaceEnabled" : true,
-                "enabled" : true
-            }
-        }
-    }
+    "parsed": {"net": {"http": {"RESTInterfaceEnabled": true, "enabled": true}}}
 };
-testGetCmdLineOptsMongod({ rest : "" }, expectedResult);
+testGetCmdLineOptsMongod({rest: ""}, expectedResult);
 
 jsTest.log("Testing \"net.http.enabled\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/enable_httpinterface.json",
-        "net" : {
-            "http" : {
-                "enabled" : true
-            }
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/enable_httpinterface.json",
+        "net": {"http": {"enabled": true}}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/enable_httpinterface.json" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/enable_httpinterface.json"},
                          expectedResult);
 
 jsTest.log("Testing with no explicit network option setting");
 expectedResult = {
-    "parsed" : {
-        "net" : { }
-    }
+    "parsed": {"net": {}}
 };
 testGetCmdLineOptsMongod({}, expectedResult);
 
-
-
 // Unix Socket
 if (!_isWindows()) {
     jsTest.log("Testing \"nounixsocket\" command line option");
     expectedResult = {
-        "parsed" : {
-            "net" : {
-                "unixDomainSocket" : {
-                    "enabled" : false
-                }
-            }
-        }
+        "parsed": {"net": {"unixDomainSocket": {"enabled": false}}}
     };
-    testGetCmdLineOptsMongod({ nounixsocket : "" }, expectedResult);
+    testGetCmdLineOptsMongod({nounixsocket: ""}, expectedResult);
 
     jsTest.log("Testing \"net.wireObjectCheck\" config file option");
     expectedResult = {
-        "parsed" : {
-            "config" : "jstests/libs/config_files/enable_unixsocket.json",
-            "net" : {
-                "unixDomainSocket" : {
-                    "enabled" : true
-                }
-            }
+        "parsed": {
+            "config": "jstests/libs/config_files/enable_unixsocket.json",
+            "net": {"unixDomainSocket": {"enabled": true}}
         }
     };
-    testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/enable_unixsocket.json" },
-                       expectedResult);
+    testGetCmdLineOptsMongod({config: "jstests/libs/config_files/enable_unixsocket.json"},
+                             expectedResult);
 
     jsTest.log("Testing with no explicit network option setting");
     expectedResult = {
-        "parsed" : {
-            "net" : { }
-        }
+        "parsed": {"net": {}}
     };
     testGetCmdLineOptsMongod({}, expectedResult);
 }
 
-
 // Test that we preserve switches explicitly set to false in config files.  See SERVER-13439.
 jsTest.log("Testing explicitly disabling \"net.http.RESTInterfaceEnabled\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_rest_interface.json",
-        "net" : {
-            "http" : {
-                "RESTInterfaceEnabled" : false
-            }
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/disable_rest_interface.json",
+        "net": {"http": {"RESTInterfaceEnabled": false}}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_rest_interface.json" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/disable_rest_interface.json"},
                          expectedResult);
 
 jsTest.log("Testing explicitly disabling \"net.http.JSONPEnabled\" config file option on mongoD");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_jsonp.json",
-        "net" : {
-            "http" : {
-                "JSONPEnabled" : false
-            }
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/disable_jsonp.json",
+        "net": {"http": {"JSONPEnabled": false}}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_jsonp.json" },
-                         expectedResult);
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/disable_jsonp.json"}, expectedResult);
 
 // jsonp on mongos is legacy and not supported in json/yaml config files since this interface is not
 // well defined.  See SERVER-11707 for an example.
 jsTest.log("Testing explicitly disabling \"jsonp\" config file option on mongoS");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_jsonp.ini",
-        "net" : {
-            "http" : {
-                "JSONPEnabled" : false
-            }
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/disable_jsonp.ini",
+        "net": {"http": {"JSONPEnabled": false}}
     }
 };
-testGetCmdLineOptsMongos({ config : "jstests/libs/config_files/disable_jsonp.ini" },
-                         expectedResult);
+testGetCmdLineOptsMongos({config: "jstests/libs/config_files/disable_jsonp.ini"}, expectedResult);
 
 jsTest.log("Testing explicitly disabled \"objcheck\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_objcheck.ini",
-        "net" : {
-            "wireObjectCheck" : false
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/disable_objcheck.ini",
+        "net": {"wireObjectCheck": false}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_objcheck.ini" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/disable_objcheck.ini"},
                          expectedResult);
 
 jsTest.log("Testing explicitly disabled \"noobjcheck\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_noobjcheck.ini",
-        "net" : {
-            "wireObjectCheck" : true
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/disable_noobjcheck.ini",
+        "net": {"wireObjectCheck": true}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_noobjcheck.ini" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/disable_noobjcheck.ini"},
                          expectedResult);
 
 jsTest.log("Testing explicitly disabled \"httpinterface\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_httpinterface.ini",
-        "net" : {
-            "http" : {
-                "enabled" : false
-            }
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/disable_httpinterface.ini",
+        "net": {"http": {"enabled": false}}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_httpinterface.ini" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/disable_httpinterface.ini"},
                          expectedResult);
 
 jsTest.log("Testing explicitly disabled \"nohttpinterface\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_nohttpinterface.ini",
-        "net" : {
-            "http" : {
-                "enabled" : true
-            }
-        }
+    "parsed": {
+        "config": "jstests/libs/config_files/disable_nohttpinterface.ini",
+        "net": {"http": {"enabled": true}}
     }
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_nohttpinterface.ini" },
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/disable_nohttpinterface.ini"},
                          expectedResult);
 
 jsTest.log("Testing explicitly disabled \"ipv6\" config file option");
 expectedResult = {
-    "parsed" : {
-        "config" : "jstests/libs/config_files/disable_ipv6.ini",
-        "net" : {
-            "ipv6" : false
-        }
-    }
+    "parsed": {"config": "jstests/libs/config_files/disable_ipv6.ini", "net": {"ipv6": false}}
 };
-testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_ipv6.ini" },
-                         expectedResult);
+testGetCmdLineOptsMongod({config: "jstests/libs/config_files/disable_ipv6.ini"}, expectedResult);
 
 if (!_isWindows()) {
     jsTest.log("Testing explicitly disabled \"nounixsocket\" config file option");
     expectedResult = {
-        "parsed" : {
-            "config" : "jstests/libs/config_files/disable_nounixsocket.ini",
-            "net" : {
-                "unixDomainSocket" : {
-                    "enabled" : true
-                }
-            }
+        "parsed": {
+            "config": "jstests/libs/config_files/disable_nounixsocket.ini",
+            "net": {"unixDomainSocket": {"enabled": true}}
         }
     };
-    testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_nounixsocket.ini" },
+    testGetCmdLineOptsMongod({config: "jstests/libs/config_files/disable_nounixsocket.ini"},
                              expectedResult);
 }
 
-
-
 print(baseName + " succeeded.");
diff --git a/jstests/httpinterface/sharding_configdb_on_default_ports.js b/jstests/httpinterface/sharding_configdb_on_default_ports.js
index 4472a7a515b..4ea1c461304 100644
--- a/jstests/httpinterface/sharding_configdb_on_default_ports.js
+++ b/jstests/httpinterface/sharding_configdb_on_default_ports.js
@@ -19,15 +19,11 @@
 
     // The config servers must support readConcern: majority to be run as a replica set, so
     // explicitly set storage engine to wiredTiger.
-    c1 = MongoRunner.runMongod({
-        configsvr: "",
-        port: 27019,
-        replSet: "csrs",
-        storageEngine: "wiredTiger"
-    });
+    c1 = MongoRunner.runMongod(
+        {configsvr: "", port: 27019, replSet: "csrs", storageEngine: "wiredTiger"});
     assert.commandWorked(c1.adminCommand("replSetInitiate"));
     c2 = MongoRunner.runMongod({configsvr: "", storageEngine: "wiredTiger"});
     c3 = MongoRunner.runMongod({configsvr: "", storageEngine: "wiredTiger"});
 
-    assert(MongoRunner.runMongos({configdb: "csrs/" + getHostPart(c1.host) }));
+    assert(MongoRunner.runMongos({configdb: "csrs/" + getHostPart(c1.host)}));
 }());