Skip to content

Commit

Permalink
chore: increase test timeout to 20 seconds on Appveyour (#3918)
Browse files Browse the repository at this point in the history
Looks like Appveyour is indeed slow; try giving it more time
to run tests.

Drive-by: support TIMEOUT env variable for Puppeteer tests.
  • Loading branch information
aslushnikov committed Feb 5, 2019
1 parent 28087c2 commit 00bcecb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
5 changes: 4 additions & 1 deletion test/puppeteer.spec.js
Expand Up @@ -22,14 +22,17 @@ const {Matchers} = require('../utils/testrunner/');
const YELLOW_COLOR = '\x1b[33m';
const RESET_COLOR = '\x1b[0m';

module.exports.addTests = ({testRunner, product, puppeteer, Errors, DeviceDescriptors, slowMo, headless}) => {
module.exports.addTests = ({testRunner, product, puppeteer, Errors, DeviceDescriptors}) => {
const {describe, xdescribe, fdescribe} = testRunner;
const {it, fit, xit} = testRunner;
const {beforeAll, beforeEach, afterAll, afterEach} = testRunner;

const CHROME = product === 'Chromium';
const FFOX = product === 'Firefox';

const headless = (process.env.HEADLESS || 'true').trim().toLowerCase() === 'true';
const slowMo = parseInt((process.env.SLOW_MO || '0').trim(), 10);

const defaultBrowserOptions = {
handleSIGINT: false,
executablePath: CHROME ? process.env.CHROME : process.env.FFOX,
Expand Down
13 changes: 4 additions & 9 deletions test/test.js
Expand Up @@ -18,9 +18,6 @@ const {TestServer} = require('../utils/testserver/');
const {TestRunner, Reporter} = require('../utils/testrunner/');
const utils = require('./utils');

const headless = (process.env.HEADLESS || 'true').trim().toLowerCase() === 'true';
const slowMo = parseInt((process.env.SLOW_MO || '0').trim(), 10);

let parallel = 1;
if (process.env.PPTR_PARALLEL_TESTS)
parallel = parseInt(process.env.PPTR_PARALLEL_TESTS.trim(), 10);
Expand All @@ -29,7 +26,10 @@ if (parallelArgIndex !== -1)
parallel = parseInt(process.argv[parallelArgIndex + 1], 10);
require('events').defaultMaxListeners *= parallel;

const timeout = slowMo ? 0 : 10 * 1000;
// Timeout to 20 seconds on Appveyor instances.
let timeout = process.env.APPVEYOR ? 20 * 1000 : 10 * 1000;
if (!isNaN(process.env.TIMEOUT))
timeout = parseInt(process.env.TIMEOUT, 10);
const testRunner = new TestRunner({timeout, parallel});
const {describe, fdescribe, beforeAll, afterAll, beforeEach, afterEach} = testRunner;

Expand Down Expand Up @@ -76,7 +76,6 @@ const CHROMIUM_NO_COVERAGE = new Set([
'securityDetails.issuer',
'securityDetails.validFrom',
'securityDetails.validTo',
...(headless ? [] : ['page.pdf']),
]);

if (process.env.BROWSER !== 'firefox') {
Expand All @@ -87,8 +86,6 @@ if (process.env.BROWSER !== 'firefox') {
Errors: utils.requireRoot('Errors'),
DeviceDescriptors: utils.requireRoot('DeviceDescriptors'),
testRunner,
slowMo,
headless,
});
if (process.env.COVERAGE)
utils.recordAPICoverage(testRunner, require('../lib/api'), CHROMIUM_NO_COVERAGE);
Expand All @@ -101,8 +98,6 @@ if (process.env.BROWSER !== 'firefox') {
Errors: require('../experimental/puppeteer-firefox/Errors'),
DeviceDescriptors: utils.requireRoot('DeviceDescriptors'),
testRunner,
slowMo,
headless,
});
});
}
Expand Down

0 comments on commit 00bcecb

Please sign in to comment.