diff --git a/.travis.yml b/.travis.yml index 3d5a1663af2c5..a64306bfa8a0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,6 @@ jobs: before_install: - PUPPETEER_PRODUCT=firefox npm install script: - - npm run test-install - npm run coverage # This bot runs all the extra checks that aren't the main Puppeteer unit tests diff --git a/mocha-config/puppeteer-unit-tests.js b/mocha-config/puppeteer-unit-tests.js index 10f7404bffb0a..c33052c436bb2 100644 --- a/mocha-config/puppeteer-unit-tests.js +++ b/mocha-config/puppeteer-unit-tests.js @@ -14,18 +14,11 @@ * limitations under the License. */ -const os = require('os'); const base = require('./base'); -const longerTimeoutRequired = process.env.PUPPETEER_PRODUCT === 'firefox' || os.platform() === 'win32'; - -const timeout = longerTimeoutRequired ? 25 * 1000 : 10 * 1000; - -console.log('Mocha config: Timeout set to', timeout / 1000, 'seconds'); - module.exports = { ...base, file: ['./test/mocha-utils.js'], spec: 'test/*.spec.js', - timeout, + timeout: 25 * 1000, };