зеркало из https://github.com/mozilla/gecko-dev.git
Bug 557589 - code audit and create unit test plan for service.js [r=mconnor]
Part 4 followup: Fix a reference error in Weave.Service._checkServerError and improve test coverage for verifyLogin() to exercise that code path.
This commit is contained in:
Родитель
a602452e16
Коммит
0b3664b843
|
@ -1524,7 +1524,7 @@ WeaveSvc.prototype = {
|
||||||
if (Utils.checkStatus(resp.status, null, [500, [502, 504]])) {
|
if (Utils.checkStatus(resp.status, null, [500, [502, 504]])) {
|
||||||
Status.enforceBackoff = true;
|
Status.enforceBackoff = true;
|
||||||
if (resp.status == 503 && resp.headers["retry-after"])
|
if (resp.status == 503 && resp.headers["retry-after"])
|
||||||
Observers.notify("weave:service:backoff:interval", parseInt(resp.headers["retry-after"], 10));
|
Svc.Obs.notify("weave:service:backoff:interval", parseInt(resp.headers["retry-after"], 10));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -18,18 +18,33 @@ function login_handler(request, response) {
|
||||||
response.bodyOutputStream.write(body, body.length);
|
response.bodyOutputStream.write(body, body.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function send(statusCode, status, body) {
|
||||||
|
return function(request, response) {
|
||||||
|
response.setStatusLine(request.httpVersion, statusCode, status);
|
||||||
|
response.bodyOutputStream.write(body, body.length);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function service_unavailable(request, response) {
|
||||||
|
let body = "Service Unavailable";
|
||||||
|
response.setStatusLine(request.httpVersion, 503, "Service Unavailable");
|
||||||
|
response.setHeader("Retry-After", "42");
|
||||||
|
response.bodyOutputStream.write(body, body.length);
|
||||||
|
}
|
||||||
|
|
||||||
function run_test() {
|
function run_test() {
|
||||||
let logger = Log4Moz.repository.rootLogger;
|
let logger = Log4Moz.repository.rootLogger;
|
||||||
Log4Moz.repository.rootLogger.addAppender(new Log4Moz.DumpAppender());
|
Log4Moz.repository.rootLogger.addAppender(new Log4Moz.DumpAppender());
|
||||||
|
|
||||||
do_test_pending();
|
do_test_pending();
|
||||||
let server = httpd_setup({
|
let server = httpd_setup({
|
||||||
"/1.0/johndoe/info/collections": login_handler
|
"/api/1.0/johndoe/info/collections": login_handler,
|
||||||
|
"/api/1.0/janedoe/info/collections": service_unavailable,
|
||||||
|
"/user/1.0/johndoe/node/weave": send(200, "OK", "http://localhost:8080/api/")
|
||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Weave.Service.serverURL = "http://localhost:8080/";
|
Weave.Service.serverURL = "http://localhost:8080/";
|
||||||
Weave.Service.clusterURL = "http://localhost:8080/";
|
|
||||||
|
|
||||||
_("Force the initial state.");
|
_("Force the initial state.");
|
||||||
Status.service = STATUS_OK;
|
Status.service = STATUS_OK;
|
||||||
|
@ -47,12 +62,27 @@ function run_test() {
|
||||||
do_check_eq(Status.service, CLIENT_NOT_CONFIGURED);
|
do_check_eq(Status.service, CLIENT_NOT_CONFIGURED);
|
||||||
do_check_eq(Status.login, LOGIN_FAILED_NO_PASSPHRASE);
|
do_check_eq(Status.login, LOGIN_FAILED_NO_PASSPHRASE);
|
||||||
|
|
||||||
|
_("verifyLogin() has found out the user's cluster URL, though.");
|
||||||
|
do_check_eq(Weave.Service.clusterURL, "http://localhost:8080/api/");
|
||||||
|
|
||||||
_("Success if passphrase is set.");
|
_("Success if passphrase is set.");
|
||||||
Weave.Service.passphrase = "foo";
|
Weave.Service.passphrase = "foo";
|
||||||
Weave.Service.login();
|
do_check_true(Weave.Service.verifyLogin());
|
||||||
do_check_eq(Status.service, STATUS_OK);
|
do_check_eq(Status.service, STATUS_OK);
|
||||||
do_check_eq(Status.login, LOGIN_SUCCEEDED);
|
do_check_eq(Status.login, LOGIN_SUCCEEDED);
|
||||||
do_check_true(Weave.Service.isLoggedIn);
|
|
||||||
|
_("If verifyLogin() encounters a server error, it flips on the backoff flag and notifies observers on a 503 with Retry-After.");
|
||||||
|
Weave.Service.username = "janedoe";
|
||||||
|
do_check_false(Status.enforceBackoff);
|
||||||
|
let backoffInterval;
|
||||||
|
Svc.Obs.add("weave:service:backoff:interval", function(subject, data) {
|
||||||
|
backoffInterval = subject;
|
||||||
|
});
|
||||||
|
do_check_false(Weave.Service.verifyLogin());
|
||||||
|
do_check_true(Status.enforceBackoff);
|
||||||
|
do_check_eq(backoffInterval, 42);
|
||||||
|
do_check_eq(Status.service, LOGIN_FAILED);
|
||||||
|
do_check_eq(Status.login, LOGIN_FAILED_SERVER_ERROR);
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
Svc.Prefs.resetBranch("");
|
Svc.Prefs.resetBranch("");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче