diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/server/mimeparse.js | 2 | ||||
| -rw-r--r-- | share/www/script/couch_test_runner.js | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/share/server/mimeparse.js b/share/server/mimeparse.js index 3642a194..42b600fa 100644 --- a/share/server/mimeparse.js +++ b/share/server/mimeparse.js @@ -97,7 +97,7 @@ var Mimeparse = (function() { if ((type == targetType || type == "*" || targetType == "*") && (subtype == targetSubtype || subtype == "*" || targetSubtype == "*")) { var matchCount = 0; - for (param in targetParams) { + for (var param in targetParams) { if (param != 'q' && params[param] && params[param] == targetParams[param]) { matchCount += 1; } diff --git a/share/www/script/couch_test_runner.js b/share/www/script/couch_test_runner.js index 55a6533f..e14640b6 100644 --- a/share/www/script/couch_test_runner.js +++ b/share/www/script/couch_test_runner.js @@ -414,9 +414,22 @@ function waitForSuccess(fun, tag) { function waitForRestart() { var waiting = true; - while (waiting) { + // Wait for the server to go down but don't + // wait too long because we might miss the + // unavailable period. + var count = 25; + while (waiting && count > 0) { + count--; try { CouchDB.request("GET", "/"); + } catch(e) { + waiting = false; + } + } + // Wait for it to come back up + waiting = true; + while (waiting) { + try { CouchDB.request("GET", "/"); waiting = false; } catch(e) { |