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

Delta Between Two Patch Sets: test/runners/webdriver.js

Issue 29874649: Issue 6822 - Report browser test errors (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Fix error reporting Created Sept. 20, 2018, 12:18 a.m.
Right Patch Set: throw instead of Promise.reject() Created Sept. 21, 2018, 3:39 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « test/runners/firefox_process.js ('k') | test_runner.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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
(...skipping 18 matching lines...) Expand all
29 window._consoleLogs.log.push(msg); 29 window._consoleLogs.log.push(msg);
30 oldLog.call(this, msg); 30 oldLog.call(this, msg);
31 };`) 31 };`)
32 .then(() => driver.executeAsyncScript(realScript, scriptArgs)) 32 .then(() => driver.executeAsyncScript(realScript, scriptArgs))
33 .then(() => driver.executeScript("return window._consoleLogs;")) 33 .then(() => driver.executeScript("return window._consoleLogs;"))
34 .then(result => 34 .then(result =>
35 { 35 {
36 console.log(`\nBrowser tests in ${name}\n`); 36 console.log(`\nBrowser tests in ${name}\n`);
37 for (let item of result.log) 37 for (let item of result.log)
38 console.log(item); 38 console.log(item);
39 driver.quit(); 39 return driver.quit().then(() =>
40 if (result.failures != 0) 40 {
41 return Promise.reject(name); 41 if (result.failures != 0)
42 throw name;
43 });
42 }, error => 44 }, error =>
43 { 45 {
44 driver.quit(); 46 // This could be replaced by Promise.finally()
Sebastian Noack 2018/09/20 17:34:00 When I was still using nodeunit in adblockpluschro
hub 2018/09/20 19:39:54 I didn't, but this totally make sense. Fixing this
45 return Promise.reject(error); 47 // once we require NodeJS >= 10
48 return driver.quit().then(() =>
49 {
50 throw error;
51 });
46 }); 52 });
47 } 53 }
48 54
49 module.exports.executeScript = executeScript; 55 module.exports.executeScript = executeScript;
LEFTRIGHT

Powered by Google App Engine
This is Rietveld