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

Delta Between Two Patch Sets: test_runner.js

Issue 29891680: Issue 6986 - Don't use chromium remote interface on Windows (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Created Sept. 25, 2018, 9:59 p.m.
Right Patch Set: Removed the changes in chrome_remote_interface Created Nov. 9, 2018, 8:02 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « test/runners/chromium_process.js ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
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 29 matching lines...) Expand all
40 chromium: chromiumProcess, 40 chromium: chromiumProcess,
41 firefox: firefoxProcess 41 firefox: firefoxProcess
42 }; 42 };
43 43
44 function configureRunners() 44 function configureRunners()
45 { 45 {
46 let runners = "BROWSER_TEST_RUNNERS" in process.env ? 46 let runners = "BROWSER_TEST_RUNNERS" in process.env ?
47 process.env.BROWSER_TEST_RUNNERS.split(",") : []; 47 process.env.BROWSER_TEST_RUNNERS.split(",") : [];
48 48
49 if (runners.length == 0) 49 if (runners.length == 0)
50 {
51 // We default to not using the Chromium remote interface on Windows,
52 // as it fails.
53 if (process.platform == "win32")
54 return ["chromium", "firefox"];
50 return ["chromium_remote", "firefox"]; 55 return ["chromium_remote", "firefox"];
56 }
51 57
52 return runners.filter(runner => runnerDefinitions.hasOwnProperty(runner)); 58 return runners.filter(runner => runnerDefinitions.hasOwnProperty(runner));
53 } 59 }
54 60
55 let runnerProcesses = configureRunners(); 61 let runnerProcesses = configureRunners();
56 62
57 function addTestPaths(testPaths, recurse) 63 function addTestPaths(testPaths, recurse)
58 { 64 {
59 for (let testPath of testPaths) 65 for (let testPath of testPaths)
60 { 66 {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 184
179 runBrowserTests(runnerProcesses).then(() => 185 runBrowserTests(runnerProcesses).then(() =>
180 { 186 {
181 if (unitFiles.length) 187 if (unitFiles.length)
182 nodeunit.reporters.default.run(unitFiles); 188 nodeunit.reporters.default.run(unitFiles);
183 }).catch(error => 189 }).catch(error =>
184 { 190 {
185 console.error(error); 191 console.error(error);
186 process.exit(1); 192 process.exit(1);
187 }); 193 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld