summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Hirschhorn <max.hirschhorn@mongodb.com>2018-02-23 18:11:03 -0500
committerMax Hirschhorn <max.hirschhorn@mongodb.com>2018-02-23 18:11:03 -0500
commit85f80aac4fe252a7d4e8e4d532a11d0621d558ac (patch)
tree825a69e30367ce111d926276437b603f829f3cb1
parent029f51d0fd9fd9ba0f921094d9cc174fd7a44944 (diff)
downloadmongo-85f80aac4fe252a7d4e8e4d532a11d0621d558ac.tar.gz
SERVER-32522 Fix lint.
-rw-r--r--jstests/libs/override_methods/override_helpers.js14
-rw-r--r--jstests/libs/override_methods/set_read_and_write_concerns.js4
2 files changed, 13 insertions, 5 deletions
diff --git a/jstests/libs/override_methods/override_helpers.js b/jstests/libs/override_methods/override_helpers.js
index 2197ec5f0ee..aafdf827d77 100644
--- a/jstests/libs/override_methods/override_helpers.js
+++ b/jstests/libs/override_methods/override_helpers.js
@@ -42,9 +42,13 @@ var OverrideHelpers = (function() {
var newCode;
if (typeof jsCode === "function") {
// Load the override file and immediately invoke the supplied function.
+ // clang-format off
newCode = `load("${overrideFile}"); (${jsCode})();`;
+ // clang-format on
} else {
+ // clang-format off
newCode = `load("${overrideFile}"); ${jsCode};`;
+ // clang-format on
}
return startParallelShellOriginal(newCode, port, noConnect);
@@ -62,7 +66,8 @@ var OverrideHelpers = (function() {
// represents an OP_QUERY find on that collection. We skip calling overrideFunc() in
// this case because the operation doesn't represent a command.
if (!(collection instanceof DBCollection &&
- (collection.getName() === "$cmd" || collection.getName().startsWith("$cmd.")))) {
+ (collection.getName() === "$cmd" ||
+ collection.getName().startsWith("$cmd.")))) {
return DBQueryOriginal.apply(this, arguments);
}
@@ -83,9 +88,10 @@ var OverrideHelpers = (function() {
};
// Copy any properties (e.g. DBQuery.Option) that are set on DBQueryOriginal.
- Object.keys(DBQueryOriginal).forEach(function(key) {
- DBQuery[key] = DBQueryOriginal[key];
- });
+ Object.keys(DBQueryOriginal)
+ .forEach(function(key) {
+ DBQuery[key] = DBQueryOriginal[key];
+ });
Mongo.prototype.runCommand = function(dbName, commandObj, options) {
const commandName = Object.keys(commandObj)[0];
diff --git a/jstests/libs/override_methods/set_read_and_write_concerns.js b/jstests/libs/override_methods/set_read_and_write_concerns.js
index 56ae306b796..30c853fb54b 100644
--- a/jstests/libs/override_methods/set_read_and_write_concerns.js
+++ b/jstests/libs/override_methods/set_read_and_write_concerns.js
@@ -12,7 +12,9 @@
" property on the global TestData object");
}
- const kDefaultReadConcern = {level: TestData.defaultReadConcernLevel};
+ const kDefaultReadConcern = {
+ level: TestData.defaultReadConcernLevel
+ };
const kDefaultWriteConcern =
(TestData.hasOwnProperty("defaultWriteConcern")) ? TestData.defaultWriteConcern : {
w: "majority",