Merge branch 'master' into fix-bt-engine-compaction-resumptionfix-bt-engine-compaction-resumption

1 files changed, 7 insertions, 2 deletions

diff --git a/test/javascript/tests/users_db_security.js b/test/javascript/tests/users_db_security.js
index 4cc154edd..c55c76434 100644
--- a/test/javascript/tests/users_db_security.js
+++ b/test/javascript/tests/users_db_security.js
@@ -32,7 +32,13 @@ couchTests.users_db_security = function(debug) {
     // the actual tests
     var username1 = username.replace(/[0-9]$/, "");
     var password = pws[username];
-    T(CouchDB.login(username1, pws[username]).ok);
+    waitForSuccess(function() {
+      var req = CouchDB.login(username1, pws[username]);
+      if (req.ok) {
+        return true
+      }
+      throw({});
+    }, 'loginUser');
   };
 
   var open_as = function(db, docId, username) {
@@ -107,7 +113,6 @@ 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);