Skip to content

Commit

Permalink
Fix integration tests: Check for root before shutdown, bail after 1 r…
Browse files Browse the repository at this point in the history
…eported issue (#155938)

Co-authored-by: Kibana Machine <[email protected]>
  • Loading branch information
TinaHeiligers and kibanamachine authored Apr 27, 2023
1 parent 863d28f commit ab8b7c1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

module.exports = {
bail: true, // only report 1 issue
// TODO replace the line below with
// preset: '@kbn/test/jest_integration_node
// to do so, we must fix all integration tests first
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ describe('SavedObjectsRepository', () => {
});

afterAll(async () => {
await esServer.stop();
await root.shutdown();
if (root) {
await esServer.stop();
await root.shutdown();
}
});

describe('#incrementCounter', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,11 @@ describe('404s from proxies', () => {
});

afterAll(async () => {
await root.shutdown();
await hapiServer.stop({ timeout: 1000 });
await esServer.stop();
if (root) {
await root.shutdown();
await hapiServer.stop({ timeout: 1000 });
await esServer.stop();
}
});

describe('requests when a proxy relays request/responses with the correct product header', () => {
Expand Down

0 comments on commit ab8b7c1

Please sign in to comment.