Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: test/runners/webdriver.js

Issue 29874649: Issue 6822 - Report browser test errors (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Remove the finally() from the promise Created Sept. 19, 2018, 7:10 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/runners/chromium_remote_process.js ('k') | test_runner.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/runners/webdriver.js
===================================================================
--- a/test/runners/webdriver.js
+++ b/test/runners/webdriver.js
@@ -19,26 +19,32 @@
function executeScript(driver, name, script, scriptName, scriptArgs)
{
let realScript = `let f = ${script}
let callback = arguments[arguments.length - 1];
return Promise.resolve()
.then(() => f(...arguments))
.then(() => callback());`;
- return driver.executeScript(`window.consoleLogs = [];
- let oldLog = console.log;
+ return driver.executeScript(`let oldLog = console.log;
console.log = msg => {
- window.consoleLogs.push(msg);
+ window._consoleLogs.log.push(msg);
oldLog.call(this, msg);
};`)
.then(() => driver.executeAsyncScript(realScript, scriptArgs))
- .then(() => driver.executeScript("return window.consoleLogs;"))
+ .then(() => driver.executeScript("return window._consoleLogs;"))
.then(result =>
{
console.log(`\nBrowser tests in ${name}\n`);
- result.forEach(item => console.log(item));
+ for (let item of result.log)
+ console.log(item);
+ if (result.failures != 0)
+ return Promise.reject(`Test ${name} failed`);
+ driver.quit();
})
- .then(() => driver.quit())
- ;
+ .catch(err =>
+ {
+ driver.quit();
+ return Promise.reject(err);
+ });
}
module.exports.executeScript = executeScript;
« no previous file with comments | « test/runners/chromium_remote_process.js ('k') | test_runner.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld