summaryrefslogtreecommitdiff
path: root/jstests/auth
diff options
context:
space:
mode:
authorMathew Robinson <chasinglogic@gmail.com>2019-12-17 14:40:28 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-02-13 15:21:41 +0000
commitf31bc89f66632b2d521be2d076dc23f94ff663eb (patch)
tree6d2dc9562fcfcefacdb1278e78e2a88e49010911 /jstests/auth
parent65c27c5f9899e2cf72b392a3f1174767afec8823 (diff)
downloadmongo-f31bc89f66632b2d521be2d076dc23f94ff663eb.tar.gz
SERVER-45048 Use hygienic builds in Evergreen
Diffstat (limited to 'jstests/auth')
-rw-r--r--jstests/auth/auth_pass_prompt.js2
-rw-r--r--jstests/auth/deleted_recreated_user_base.js2
-rw-r--r--jstests/auth/mongoURIAuth.js2
-rw-r--r--jstests/auth/pinned_users_clear_pinned_user_list.js2
-rw-r--r--jstests/auth/pinned_users_exclusive_lock_on_admin.js2
-rw-r--r--jstests/auth/pinned_users_remove_user_document_unpins_user.js2
-rw-r--r--jstests/auth/repl_auth_shell_mechanism.js8
7 files changed, 10 insertions, 10 deletions
diff --git a/jstests/auth/auth_pass_prompt.js b/jstests/auth/auth_pass_prompt.js
index 0a1027cadff..6bb98b8f134 100644
--- a/jstests/auth/auth_pass_prompt.js
+++ b/jstests/auth/auth_pass_prompt.js
@@ -14,7 +14,7 @@ if (!_isWindows()) {
"'var database = db.getMongo().getDB(" + database + "); database.auth(" + user + ");'";
const binshell = '/bin/sh';
- const mongo = './mongo';
+ const mongo = 'mongo';
const host = conn.host;
const port = conn.port;
const ret = runProgram(
diff --git a/jstests/auth/deleted_recreated_user_base.js b/jstests/auth/deleted_recreated_user_base.js
index c64b2e4126f..1a3a8556d91 100644
--- a/jstests/auth/deleted_recreated_user_base.js
+++ b/jstests/auth/deleted_recreated_user_base.js
@@ -33,7 +33,7 @@ function runTest(s0, s1) {
// Perform administrative commands via separate shell.
function evalCmd(cmd) {
const uri = 'mongodb://admin:pass@localhost:' + s1.port + '/admin';
- const result = runMongoProgram('./mongo', uri, '--eval', cmd);
+ const result = runMongoProgram('mongo', uri, '--eval', cmd);
assert.eq(result, 0, "Command failed");
}
evalCmd('db.dropUser("user"); ');
diff --git a/jstests/auth/mongoURIAuth.js b/jstests/auth/mongoURIAuth.js
index abf518c5a98..fa6a0ad40db 100644
--- a/jstests/auth/mongoURIAuth.js
+++ b/jstests/auth/mongoURIAuth.js
@@ -44,7 +44,7 @@ const runURIAuthTest = function(userMech, uriMech, authMechanism, regexMechanism
uri = "mongodb://user:password@localhost:" + conn.port;
}
- var shell = runMongoProgram('./mongo', uri, "--eval", "db.getName()");
+ var shell = runMongoProgram('mongo', uri, "--eval", "db.getName()");
assert.eq(shell, 0, "Should be able to connect with specified params.");
const log = adminDB.runCommand({getLog: "global"});
diff --git a/jstests/auth/pinned_users_clear_pinned_user_list.js b/jstests/auth/pinned_users_clear_pinned_user_list.js
index 95119a12fe8..177e2b9e797 100644
--- a/jstests/auth/pinned_users_clear_pinned_user_list.js
+++ b/jstests/auth/pinned_users_clear_pinned_user_list.js
@@ -1,7 +1,7 @@
(function() {
'use strict';
-jsTest.setOption("enableTestCommands", true);
+TestData.enableTestCommands = true;
// Start a mongod with the user cache size set to zero, so we know that users who have logged out
// always get fetched cleanly from disk.
diff --git a/jstests/auth/pinned_users_exclusive_lock_on_admin.js b/jstests/auth/pinned_users_exclusive_lock_on_admin.js
index 037b6a5b288..be0f8661d7b 100644
--- a/jstests/auth/pinned_users_exclusive_lock_on_admin.js
+++ b/jstests/auth/pinned_users_exclusive_lock_on_admin.js
@@ -12,7 +12,7 @@
load("jstests/libs/wait_for_command.js");
-jsTest.setOption("enableTestCommands", true);
+TestData.enableTestCommands = true;
// Start a mongod with the user cache size set to zero, so we know that users who have logged out
// always get fetched cleanly from disk.
diff --git a/jstests/auth/pinned_users_remove_user_document_unpins_user.js b/jstests/auth/pinned_users_remove_user_document_unpins_user.js
index a09aad8393b..362b11166c4 100644
--- a/jstests/auth/pinned_users_remove_user_document_unpins_user.js
+++ b/jstests/auth/pinned_users_remove_user_document_unpins_user.js
@@ -6,7 +6,7 @@
(function() {
'use strict';
-jsTest.setOption("enableTestCommands", true);
+TestData.enableTestCommands = true;
// Start a mongod with the user cache size set to zero, so we know that users who have logged out
// always get fetched cleanly from disk.
diff --git a/jstests/auth/repl_auth_shell_mechanism.js b/jstests/auth/repl_auth_shell_mechanism.js
index acf724e7809..72a00d5204b 100644
--- a/jstests/auth/repl_auth_shell_mechanism.js
+++ b/jstests/auth/repl_auth_shell_mechanism.js
@@ -29,7 +29,7 @@ const rsName = connString.substr(0, slash);
const rsHosts = connString.substr(slash + 1);
// Connect with shell using connString.
-const csShell = runMongoProgram('./mongo',
+const csShell = runMongoProgram('mongo',
'--host',
connString,
'-u',
@@ -43,7 +43,7 @@ const csShell = runMongoProgram('./mongo',
assert.eq(csShell, 0, 'Failed to connect using connection string');
// Connect with shell explicitly specifying mechanism.
-const csShellMech = runMongoProgram('./mongo',
+const csShellMech = runMongoProgram('mongo',
'--host',
connString,
'-u',
@@ -60,12 +60,12 @@ assert.eq(csShellMech, 0, 'Failed to connect using connection string');
// Connect with shell using URI.
const uriString = 'mongodb://admin:password@' + rsHosts + '/admin?replicaSet=' + rsName;
-const uriShell = runMongoProgram('./mongo', uriString, '--eval', ';');
+const uriShell = runMongoProgram('mongo', uriString, '--eval', ';');
assert.eq(uriShell, 0, 'Failed to connect using URI');
// Connect with shell using URI and explcit mechanism.
const uriShellMech =
- runMongoProgram('./mongo', uriString + '&authMechanism=SCRAM-SHA-256', '--eval', ';');
+ runMongoProgram('mongo', uriString + '&authMechanism=SCRAM-SHA-256', '--eval', ';');
assert.eq(uriShellMech, 0, 'Failed to connect using URI');
rsTest.stopSet();