зеркало из https://github.com/mozilla/gecko-dev.git
Bug 977198 - better contextual logging for test failures in mochitests; r=jmaher
This commit is contained in:
Родитель
b2f3c9e80a
Коммит
73233c5452
|
@ -328,43 +328,27 @@ SimpleTest.requestCompleteLog = function() {
|
|||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* A circular buffer, managed by _logResult. We explicitly manage the
|
||||
* circularness of the buffer, rather than resorting to .shift()/.push()
|
||||
* because explicit management is much faster.
|
||||
*/
|
||||
SimpleTest._bufferedMessages = [];
|
||||
SimpleTest._logResult = (function () {
|
||||
var numCoalescedMessages = 1;
|
||||
var coalesceThreshold = 100;
|
||||
var bufferingThreshold = 100;
|
||||
var outputIndex = 0;
|
||||
|
||||
function logResult(test, passString, failString) {
|
||||
var isError = !test.result == !test.todo;
|
||||
var outputCoalescedMessage = numCoalescedMessages == coalesceThreshold;
|
||||
|
||||
var runningSingleTest = ((parentRunner &&
|
||||
parentRunner._urls.length == 1)
|
||||
|| isSingleTestRun);
|
||||
// We want to eliminate mundane TEST-PASS/TEST-KNOWN-FAIL output,
|
||||
// since some tests produce tens of thousands of
|
||||
// TEST-PASS/TEST-KNOWN-FAIL messages. But we always want to log
|
||||
// errors and informative messages. We also want to output messages
|
||||
// every so often to let the user know the test is still running.
|
||||
// If they user is only running a single test, it is likely that they
|
||||
// want to see all the test messages.
|
||||
var shouldLog = (isError ||
|
||||
passString == "TEST-INFO" ||
|
||||
outputCoalescedMessage ||
|
||||
runningSingleTest ||
|
||||
SimpleTest._forceLogMessageOutput);
|
||||
|
||||
if (!shouldLog) {
|
||||
++numCoalescedMessages;
|
||||
return;
|
||||
}
|
||||
|
||||
var resultString = test.result ? passString : failString;
|
||||
var url = SimpleTest._getCurrentTestURL();
|
||||
var resultString = test.result ? passString : failString;
|
||||
var diagnostic = test.name + (test.diag ? " - " + test.diag : "");
|
||||
if (outputCoalescedMessage) {
|
||||
diagnostic += " (elided " + numCoalescedMessages + " passes or known failures)";
|
||||
numCoalescedMessages = 1;
|
||||
}
|
||||
var msg = [resultString, url, diagnostic].join(" | ");
|
||||
var isError = !test.result == !test.todo;
|
||||
|
||||
// Due to JavaScript's name lookup rules, it is important that
|
||||
// the second parameter here be named identically to the isError
|
||||
// variable declared above.
|
||||
function dumpMessage(msg, isError) {
|
||||
if (parentRunner) {
|
||||
if (isError) {
|
||||
parentRunner.addFailedTest(url);
|
||||
|
@ -379,6 +363,75 @@ SimpleTest._logResult = (function () {
|
|||
}
|
||||
}
|
||||
|
||||
// Detect when SimpleTest.reset() has been called, so we can
|
||||
// reset outputIndex. We store outputIndex as local state to
|
||||
// avoid adding even more state to SimpleTest.
|
||||
if (SimpleTest._bufferedMessages.length == 0) {
|
||||
outputIndex = 0;
|
||||
}
|
||||
|
||||
// We want to eliminate mundane TEST-PASS/TEST-KNOWN-FAIL
|
||||
// output, since some tests produce tens of thousands of of such
|
||||
// messages. These messages can consume a lot of memory to
|
||||
// generate and take a significant amount of time to output.
|
||||
// However, the reality is that TEST-PASS messages can also be
|
||||
// used as a form of logging via constructs like:
|
||||
//
|
||||
// SimpleTest.ok(true, "some informative message");
|
||||
//
|
||||
// And eliding the logging can be very confusing when trying to
|
||||
// debug test failures.
|
||||
//
|
||||
// Hence the compromise adopted here: We buffer messages up to
|
||||
// some limit and dump the buffer when a test failure happens.
|
||||
// This behavior ought to provide enough context for developers
|
||||
// looking to understand where in the test things failed.
|
||||
if (isError) {
|
||||
// Display this message and all the messages we have buffered.
|
||||
if (SimpleTest._bufferedMessages.length > 0) {
|
||||
dumpMessage("TEST-INFO | dumping last " + SimpleTest._bufferedMessages.length + " message(s)");
|
||||
dumpMessage("TEST-INFO | if you need more context, please use SimpleTest.requestCompleteLog() in your test");
|
||||
|
||||
function dumpBufferedMessage(m) {
|
||||
dumpMessage(m, false);
|
||||
}
|
||||
// The latest message is just before outputIndex.
|
||||
// The earliest message is located at outputIndex.
|
||||
var earliest = SimpleTest._bufferedMessages.slice(outputIndex);
|
||||
var latest = SimpleTest._bufferedMessages.slice(0, outputIndex);
|
||||
earliest.map(dumpBufferedMessage);
|
||||
latest.map(dumpBufferedMessage);
|
||||
|
||||
SimpleTest._bufferedMessages = [];
|
||||
}
|
||||
|
||||
dumpMessage(msg);
|
||||
return;
|
||||
}
|
||||
|
||||
var runningSingleTest = ((parentRunner &&
|
||||
parentRunner._urls.length == 1) ||
|
||||
isSingleTestRun);
|
||||
var shouldLogImmediately = (runningSingleTest ||
|
||||
SimpleTest._forceLogMessageOutput);
|
||||
|
||||
if (!shouldLogImmediately) {
|
||||
// Buffer the message for possible later output.
|
||||
if (SimpleTest._bufferedMessages.length >= bufferingThreshold) {
|
||||
if (outputIndex >= bufferingThreshold) {
|
||||
outputIndex = 0;
|
||||
}
|
||||
SimpleTest._bufferedMessages[outputIndex] = msg;
|
||||
outputIndex++;
|
||||
} else {
|
||||
SimpleTest._bufferedMessages.push(msg);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
dumpMessage(msg);
|
||||
}
|
||||
|
||||
return logResult;
|
||||
})();
|
||||
|
||||
|
@ -1032,6 +1085,7 @@ SimpleTest.isIgnoringAllUncaughtExceptions = function () {
|
|||
SimpleTest.reset = function () {
|
||||
SimpleTest._ignoringAllUncaughtExceptions = false;
|
||||
SimpleTest._expectingUncaughtException = false;
|
||||
SimpleTest._bufferedMessages = [];
|
||||
};
|
||||
|
||||
if (isPrimaryTestWindow) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче