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

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

Issue 29720661: Issue 6391 - Allow running the browser unit tests with Firefox (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Fix the truncated output in Chromium. Created March 21, 2018, 8:53 p.m.
Right Patch Set: Update Firefox version in README Created Aug. 3, 2018, 4:15 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/.eslintrc.json ('k') | test/runners/chromium_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
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
18 /* eslint-env node */
kzar 2018/04/20 15:39:05 Perhaps put these ESLint rules in a file test/runn
hub 2018/04/24 14:05:55 Done.
19 /* eslint no-console: "off" */
20 17
21 "use strict"; 18 "use strict";
22 19
23 const fs = require("fs"); 20 const fs = require("fs");
24 const path = require("path"); 21 const path = require("path");
25 22
26 const {download, unzipArchive} = require("./download"); 23 const {download, unzipArchive} = require("./download");
27 24
28 function getChromiumExecutable(chromiumDir) 25 function getChromiumExecutable(chromiumDir)
29 { 26 {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 69
73 let [dir, fileName] = buildTypes[platform]; 70 let [dir, fileName] = buildTypes[platform];
74 let archive = path.join(snapshotsDir, "download-cache", 71 let archive = path.join(snapshotsDir, "download-cache",
75 `${chromiumRevision}-${fileName}`); 72 `${chromiumRevision}-${fileName}`);
76 73
77 return Promise.resolve() 74 return Promise.resolve()
78 .then(() => 75 .then(() =>
79 { 76 {
80 if (!fs.existsSync(archive)) 77 if (!fs.existsSync(archive))
81 { 78 {
82 let url = `https://www.googleapis.com/download/storage/v1/b/chromium-b rowser-snapshots/o/${dir}%2F${chromiumRevision}%2F${fileName}?alt=media`;
83 console.info("Downloading Chromium..."); 79 console.info("Downloading Chromium...");
84 return download(url, archive); 80 return download(
81 `https://www.googleapis.com/download/storage/v1/b/chromium-browser-s napshots/o/${dir}%2F${chromiumRevision}%2F${fileName}?alt=media`,
82 archive);
85 } 83 }
86 console.info(`Reusing cached archive ${archive}`); 84 console.info(`Reusing cached archive ${archive}`);
87 }) 85 })
88 .then(() => unzipArchive(archive, chromiumDir)) 86 .then(() => unzipArchive(archive, chromiumDir))
89 .then(() => chromiumDir); 87 .then(() => chromiumDir);
90 }).then(dir => getChromiumExecutable(dir)); 88 }).then(dir => getChromiumExecutable(dir));
91 } 89 }
92 90
93 module.exports.ensureChromium = ensureChromium; 91 module.exports.ensureChromium = ensureChromium;
LEFTRIGHT

Powered by Google App Engine
This is Rietveld