Skip to content

Commit

Permalink
fix(Launcher): fix dumpio bug (#2071)
Browse files Browse the repository at this point in the history
This patch fixes `dumpio` launcher option.

Fixes #2046
  • Loading branch information
yanivefraim authored and aslushnikov committed Feb 23, 2018
1 parent ee7ebd6 commit 6688774
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
8 changes: 6 additions & 2 deletions lib/Launcher.js
Expand Up @@ -100,10 +100,9 @@ class Launcher {
if (Array.isArray(options.args))
chromeArguments.push(...options.args);

const stdio = options.dumpio ? ['inherit', 'inherit', 'inherit'] : ['pipe', 'pipe', 'pipe'];
const stdio = ['pipe', 'pipe', 'pipe'];
if (options.appMode)
stdio.push('pipe', 'pipe');

const chromeProcess = childProcess.spawn(
chromeExecutable,
chromeArguments,
Expand All @@ -114,6 +113,11 @@ class Launcher {
}
);

if (options.dumpio) {
chromeProcess.stderr.pipe(process.stderr);
chromeProcess.stdout.pipe(process.stdout);
}

let chromeClosed = false;
const waitForChromeToClose = new Promise((fulfill, reject) => {
chromeProcess.once('close', () => {
Expand Down
9 changes: 9 additions & 0 deletions test/fixtures/dumpio.js
@@ -0,0 +1,9 @@
(async() => {
const [, , puppeteerRoot, options, emptyPage, dumpioTextToLog] = process.argv;
const browser = await require(puppeteerRoot).launch(JSON.parse(options));
const page = await browser.newPage();
await page.goto(emptyPage);
await page.evaluate(_dumpioTextToLog => console.log(_dumpioTextToLog), dumpioTextToLog);
await page.close();
await browser.close();
})();
12 changes: 12 additions & 0 deletions test/test.js
Expand Up @@ -271,6 +271,18 @@ describe('Puppeteer', function() {
const args = puppeteer.defaultArgs();
expect(args).toContain('--no-first-run');
});
it('should dump browser process stderr', async({server}) => {
const dumpioTextToLog = 'MAGIC_DUMPIO_TEST';
let dumpioData = '';
const {spawn} = require('child_process');
const options = Object.assign({dumpio: true}, defaultBrowserOptions);
const res = spawn('node',
[path.join(__dirname, 'fixtures', 'dumpio.js'), PROJECT_ROOT, JSON.stringify(options), server.EMPTY_PAGE, dumpioTextToLog]);
res.stderr.on('data', data => dumpioData += data.toString('utf8'));
await new Promise(resolve => res.on('close', resolve));

expect(dumpioData).toContain(dumpioTextToLog);
});
});
describe('Puppeteer.connect', function() {
it('should be able to connect multiple times to the same browser', async({server}) => {
Expand Down

0 comments on commit 6688774

Please sign in to comment.