summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoan Touzet <joant@atypical.net>2018-07-18 12:23:36 -0400
committerJoan Touzet <wohali@users.noreply.github.com>2018-07-18 14:31:35 -0400
commitc94cc4cea335f7ef747fa97fd3b7df8a1ae902cf (patch)
tree0e63e4bf1c7570c49eaf79af6e9fd3f0099fe364
parenta239f766fd640a83a4945a3b769d842aa3759af0 (diff)
downloadcouchdb-c94cc4cea335f7ef747fa97fd3b7df8a1ae902cf.tar.gz
Revert "Make loginUser wait for successful authentication"
This reverts commit 6ffe0421ac524138a6b48fd010f2540631b83d16.
-rw-r--r--test/javascript/tests/users_db_security.js9
1 files changed, 2 insertions, 7 deletions
diff --git a/test/javascript/tests/users_db_security.js b/test/javascript/tests/users_db_security.js
index c55c76434..4cc154edd 100644
--- a/test/javascript/tests/users_db_security.js
+++ b/test/javascript/tests/users_db_security.js
@@ -32,13 +32,7 @@ couchTests.users_db_security = function(debug) {
// the actual tests
var username1 = username.replace(/[0-9]$/, "");
var password = pws[username];
- waitForSuccess(function() {
- var req = CouchDB.login(username1, pws[username]);
- if (req.ok) {
- return true
- }
- throw({});
- }, 'loginUser');
+ T(CouchDB.login(username1, pws[username]).ok);
};
var open_as = function(db, docId, username) {
@@ -113,6 +107,7 @@ couchTests.users_db_security = function(debug) {
// jan's gonna be admin as he's the first user
TEquals(true, usersDb.save(userDoc).ok, "should save document");
+ wait(5000);
userDoc = open_as(usersDb, "org.couchdb.user:jchris", "jchris");
TEquals(undefined, userDoc.password, "password field should be null 1");
TEquals(scheme, userDoc.password_scheme, "password_scheme should be " + scheme);