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

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

Issue 29858555: Issue 6391 - WebDriver: Fix runtime problen with Gecko and Firefox (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Fixed Firefox too and now run by default also with Firefox Created Aug. 21, 2018, 2 p.m.
Right Patch Set: Updated comments Created Aug. 22, 2018, 5:36 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 | « README.md ('k') | test/runners/firefox_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 17 matching lines...) Expand all
28 // Chromium 63.0.3239.x is 508578 28 // Chromium 63.0.3239.x is 508578
29 // Chromium 65.0.3325.0 is 530368 29 // Chromium 65.0.3325.0 is 530368
30 // We currently want Chromiun 63, as we still support it and that's the 30 // We currently want Chromiun 63, as we still support it and that's the
31 // loweset version that supports WebDriver. 31 // loweset version that supports WebDriver.
32 const CHROMIUM_REVISION = 508578; 32 const CHROMIUM_REVISION = 508578;
33 33
34 function runScript(chromiumPath, script, scriptName, scriptArgs) 34 function runScript(chromiumPath, script, scriptName, scriptArgs)
35 { 35 {
36 const options = new chrome.Options() 36 const options = new chrome.Options()
37 .headless() 37 .headless()
38 // disabling sandboxing. It is needed on some systems. 38 // Disabling sandboxing is needed on some system configurations
Sebastian Noack 2018/08/22 17:02:04 Nit: Proper capitalization and punctuation please:
hub 2018/08/22 17:36:55 Done.
39 // like Debian 9.
39 .addArguments("--no-sandbox") 40 .addArguments("--no-sandbox")
40 .setChromeBinaryPath(chromiumPath); 41 .setChromeBinaryPath(chromiumPath);
41 42
42 const driver = new Builder() 43 const driver = new Builder()
43 .forBrowser("chrome") 44 .forBrowser("chrome")
44 .setChromeOptions(options) 45 .setChromeOptions(options)
45 .build(); 46 .build();
46 47
47 return executeScript(driver, "Chromium (WebDriver)", 48 return executeScript(driver, "Chromium (WebDriver)",
48 script, scriptName, scriptArgs); 49 script, scriptName, scriptArgs);
49 } 50 }
50 51
51 module.exports = function(script, scriptName, ...scriptArgs) 52 module.exports = function(script, scriptName, ...scriptArgs)
52 { 53 {
53 return ensureChromium(CHROMIUM_REVISION).then(chromiumPath => 54 return ensureChromium(CHROMIUM_REVISION).then(chromiumPath =>
54 { 55 {
55 return runScript(chromiumPath, script, scriptName, scriptArgs) 56 return runScript(chromiumPath, script, scriptName, scriptArgs)
56 .then(result => result) 57 .then(result => result)
57 .catch(error => 58 .catch(error =>
58 { 59 {
59 console.log("chromium_process: error caught");
60 throw error; 60 throw error;
61 }); 61 });
62 }); 62 });
63 }; 63 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld