Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: small CI tidy ups #5751

Merged
merged 1 commit into from Apr 27, 2020
Merged

chore: small CI tidy ups #5751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Expand Up @@ -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
Expand Down
9 changes: 1 addition & 8 deletions mocha-config/puppeteer-unit-tests.js
View file
Open in desktop
Expand Up @@ -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,
};