Skip to content

Commit

Permalink
[7.0] [jest/integration] set default test timeout to 30 seconds (#33718
Browse files Browse the repository at this point in the history
…) (#33749)

Backports the following commits to 7.0:
 - [jest/integration] set default test timeout to 30 seconds  (#33718)
  • Loading branch information
Spencer authored Mar 22, 2019
1 parent aa6fa02 commit 3378a53
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/dev/jest/config.integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,7 @@ export default {
'default',
['<rootDir>/src/dev/jest/junit_reporter.js', { reportName: 'Jest Integration Tests' }],
],
setupFilesAfterEnv: [
'<rootDir>/src/dev/jest/setup/after_env.integration.js'
]
};
25 changes: 25 additions & 0 deletions src/dev/jest/setup/after_env.integration.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

/* eslint-env jest */

/**
* Set the default timeout for the integration test suite to 30 seconds
*/
jest.setTimeout(30 * 1000);
3 changes: 3 additions & 0 deletions x-pack/test_utils/jest/config.integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@ export default {
'default',
['<rootDir>/../src/dev/jest/junit_reporter.js', { reportName: 'Jest Integration Tests' }],
],
setupFilesAfterEnv: [
'<rootDir>/../src/dev/jest/setup/after_env.integration.js'
]
};

0 comments on commit 3378a53

Please sign in to comment.