wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1051635 - Fix the missing error handling in TestRunner (structured logging). r=chmanchester

Browse Source
This commit is contained in:
Ahmed Kachkach 2014-08-12 13:59:00 -04:00
parent 5a50f85702
commit 0cf274b769
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/mochitest/tests/SimpleTest/TestRunner.js
View File

@ -261,6 +261,11 @@ function StructuredLogger(name) {
} else { } else {
dump('\n' + str + '\n'); dump('\n' + str + '\n');
} }
// Checking for error messages
if (message.expected || message.level === "ERROR") {
TestRunner.failureHandler();
}
}; };
/* Message validation. Only checking the action for now */ /* Message validation. Only checking the action for now */
@ -425,8 +430,11 @@ TestRunner.error = function(msg) {
TestRunner.structuredLogger.error(msg); TestRunner.structuredLogger.error(msg);
} else { } else {
dump(msg + "\n"); dump(msg + "\n");
TestRunner.failureHandler();
} }
};
TestRunner.failureHandler = function() {
if (TestRunner.runUntilFailure) { if (TestRunner.runUntilFailure) {
TestRunner._haltTests = true; TestRunner._haltTests = true;
} }
@ -469,7 +477,7 @@ TestRunner._makeIframe = function (url, retry) {
return; return;
} }
TestRunner.structuredLogger.error("Unable to restore focus, expect failures and timeouts."); TestRunner.structuredLogger.info("Error: Unable to restore focus, expect failures and timeouts.");
} }
window.scrollTo(0, $('indicator').offsetTop); window.scrollTo(0, $('indicator').offsetTop);
iframe.src = url; iframe.src = url;