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

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

Issue 29874649: Issue 6822 - Report browser test errors (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Minor reformat Created Sept. 14, 2018, 12:37 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/browser/_bootstrap.js ('k') | test/runners/chromium_remote_process.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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 .forBrowser("chrome") 44 .forBrowser("chrome")
45 .setChromeOptions(options) 45 .setChromeOptions(options)
46 .build(); 46 .build();
47 47
48 return executeScript(driver, "Chromium (WebDriver)", 48 return executeScript(driver, "Chromium (WebDriver)",
49 script, scriptName, scriptArgs); 49 script, scriptName, scriptArgs);
50 } 50 }
51 51
52 module.exports = function(script, scriptName, ...scriptArgs) 52 module.exports = function(script, scriptName, ...scriptArgs)
53 { 53 {
54 return ensureChromium(CHROMIUM_REVISION).then(chromiumPath => 54 return ensureChromium(CHROMIUM_REVISION)
55 { 55 .then(chromiumPath => runScript(chromiumPath, script, scriptName, scriptArgs ));
56 return runScript(chromiumPath, script, scriptName, scriptArgs)
57 .then(result => result)
58 .catch(error =>
59 {
60 console.log("chromium_process: error caught");
61 throw error;
62 });
63 });
64 }; 56 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld