Bug 1143222 - Avoid dumping out extremely long response bodies to the mochitest log, and re-enable the newly added DOM cache tests to run both in seqential and parallel modes; r=bkelly

The test timeouts here are some form of bug 1141256, which causes the service
worker spawned in the parallel mode of the tests to never start up.  It turns
out that avoiding sending this huge message to the mochitest logger avoids the
issue on the infrastructure, so let's re-enable these tests.  Bug 1141256 still
needs to be investigated.
This commit is contained in:
Ehsan Akhgari 2015-03-16 20:40:01 -04:00
parent a72962d364
commit 41f1bd318c
3 changed files with 9 additions and 4 deletions

View File

@ -81,8 +81,7 @@ function runTests(testFile, order) {
SimpleTest.waitForExplicitFinish();
if (typeof order == "undefined") {
order = "sequential"; // sequential by default, see bug 1143222.
// TODO: Make this "both".
order = "both"; // both by default
}
ok(order == "parallel" || order == "sequential" || order == "both",

View File

@ -18,7 +18,10 @@ function checkResponse(r, response, responseText) {
is(r.statusText, response.statusText,
"Both responses should have the same status text");
return r.text().then(function(text) {
is(text, responseText, "The response body should be correct");
// Avoid dumping out the large response text to the log if they're equal.
if (text !== responseText) {
is(text, responseText, "The response body should be correct");
}
});
}

View File

@ -16,7 +16,10 @@ function checkResponse(r) {
is(r.statusText, response.statusText,
"Both responses should have the same status text");
return r.text().then(function(text) {
is(text, responseText, "The response body should be correct");
// Avoid dumping out the large response text to the log if they're equal.
if (text !== responseText) {
is(text, responseText, "The response body should be correct");
}
});
}