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

Side by Side 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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « test/runners/chromium_remote_process.js ('k') | test_runner.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 "use strict"; 18 "use strict";
19 19
20 function executeScript(driver, name, script, scriptName, scriptArgs) 20 function executeScript(driver, name, script, scriptName, scriptArgs)
21 { 21 {
22 let realScript = `let f = ${script} 22 let realScript = `let f = ${script}
23 let callback = arguments[arguments.length - 1]; 23 let callback = arguments[arguments.length - 1];
24 return Promise.resolve() 24 return Promise.resolve()
25 .then(() => f(...arguments)) 25 .then(() => f(...arguments))
26 .then(() => callback());`; 26 .then(() => callback());`;
27 return driver.executeScript(`window.consoleLogs = []; 27 return driver.executeScript(`let oldLog = console.log;
28 let oldLog = console.log;
29 console.log = msg => { 28 console.log = msg => {
30 window.consoleLogs.push(msg); 29 window._consoleLogs.log.push(msg);
31 oldLog.call(this, msg); 30 oldLog.call(this, msg);
32 };`) 31 };`)
33 .then(() => driver.executeAsyncScript(realScript, scriptArgs)) 32 .then(() => driver.executeAsyncScript(realScript, scriptArgs))
34 .then(() => driver.executeScript("return window.consoleLogs;")) 33 .then(() => driver.executeScript("return window._consoleLogs;"))
35 .then(result => 34 .then(result =>
36 { 35 {
37 console.log(`\nBrowser tests in ${name}\n`); 36 console.log(`\nBrowser tests in ${name}\n`);
38 result.forEach(item => console.log(item)); 37 for (let item of result.log)
38 console.log(item);
39 if (result.failures != 0)
40 return Promise.reject(`Test ${name} failed`);
41 driver.quit();
39 }) 42 })
40 .then(() => driver.quit()) 43 .catch(err =>
41 ; 44 {
45 driver.quit();
46 return Promise.reject(err);
47 });
42 } 48 }
43 49
44 module.exports.executeScript = executeScript; 50 module.exports.executeScript = executeScript;
OLDNEW
« 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