summaryrefslogtreecommitdiff
path: root/share/www/script/test/oauth.js
diff options
context:
space:
mode:
authorJohn Christopher Anderson <jchris@apache.org>2010-04-06 19:54:04 +0000
committerJohn Christopher Anderson <jchris@apache.org>2010-04-06 19:54:04 +0000
commitc6b27a3d4fbd4dcbf5716720af5be4e31bf2a8c7 (patch)
tree3aaa47c50596f0e5e62c37406812f8ca3b88e204 /share/www/script/test/oauth.js
parent8897dbe40941295009d156bf77eb0bf40abc5136 (diff)
use waitForSuccess to timeout changes requests that never succeed
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@931297 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'share/www/script/test/oauth.js')
-rw-r--r--share/www/script/test/oauth.js23
1 files changed, 12 insertions, 11 deletions
diff --git a/share/www/script/test/oauth.js b/share/www/script/test/oauth.js
index 62782853..b439b4db 100644
--- a/share/www/script/test/oauth.js
+++ b/share/www/script/test/oauth.js
@@ -94,17 +94,18 @@ couchTests.oauth = function(debug) {
headers: {"X-Couch-Persist": "false"},
body: JSON.stringify(testadminPassword)
});
- while (true) {
- //loop until the couch server has processed the password
- var xhr = CouchDB.request("GET", "http://" + host + "/_config/admins/testadmin?foo="+i,{
- headers: {
- "Authorization": adminBasicAuthHeaderValue()
- }})
- if (xhr.responseText.indexOf("\"-hashed-") == 0) {
- break;
- }
- console.log("foo:" + xhr.responseText)
- }
+ var i = 0;
+ waitForSuccess(function() {
+ //loop until the couch server has processed the password
+ i += 1;
+ var xhr = CouchDB.request("GET", "http://" + host + "/_config/admins/testadmin?foo="+i,{
+ headers: {
+ "Authorization": adminBasicAuthHeaderValue()
+ }});
+ if (xhr.responseText.indexOf("\"-hashed-") != 0) {
+ throw("still waiting");
+ }
+ }, "wait-for-admin");
CouchDB.newUuids(2); // so we have one to make the salt