Fix integration tests: Check for root before shutdown, bail after 1 r…

…eported issue (elastic#155938) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
kibanamachine · Apr 27, 2023 · ab8b7c1 · ab8b7c1
1 parent 863d28f
commit ab8b7c1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/core/server/integration_tests/saved_objects/jest.integration.config.js b/src/core/server/integration_tests/saved_objects/jest.integration.config.js
@@ -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

diff --git a/src/core/server/integration_tests/saved_objects/service/lib/repository.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/repository.test.ts
@@ -46,8 +46,10 @@ describe('SavedObjectsRepository', () => {
  });
 
  afterAll(async () => {
- await esServer.stop();
- await root.shutdown();
+ if (root) {
+ await esServer.stop();
+ await root.shutdown();
+ }
  });
 
  describe('#incrementCounter', () => {

diff --git a/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts
@@ -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', () => {