simplify, longer timeout, more logs

elastic · Aug 21, 2023 · 6446381 · 6446381
1 parent 0efae80
commit 6446381
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/packages/core/test-helpers/core-test-helpers-kbn-server/src/create_serverless_root.ts b/packages/core/test-helpers/core-test-helpers-kbn-server/src/create_serverless_root.ts
@@ -23,25 +23,11 @@ export const createServerlessES = () => {
   });
   const cluster = new Cluster({ log });
 
-  let started = false;
   const api = {
     start: async () => {
-      if (started) throw new Error('ES already started!');
-      await Promise.race([
-        cluster
-          .runServerless({
-            basePath: Path.join(REPO_ROOT, '.es/es_test_serverless'),
-          })
-          .then(() => {
-            started = true;
-          }),
-        new Promise((res) => setTimeout(res, 60000)).then(async () => {
-          if (!started) {
-            await api.stop().catch(() => undefined);
-            throw new Error(`could not start ES serverless in 60 seconds ( ,_,)`);
-          }
-        }),
-      ]);
+      await cluster.runServerless({
+        basePath: Path.join(REPO_ROOT, '.es/es_test_serverless'),
+      });
     },
     stop: async () => {
       // hack to stop the ES cluster

diff --git a/src/core/server/integration_tests/saved_objects/migrations/serverless/smoke.test.ts b/src/core/server/integration_tests/saved_objects/migrations/serverless/smoke.test.ts
@@ -17,7 +17,7 @@ import {
 describe('smoke', () => {
   let serverlessES: TestServerlessESUtils;
   let serverlessKibana: TestServerlessKibanaUtils;
-  jest.setTimeout(300_000); // five mins :shrug:
+  jest.setTimeout(600_000);
   beforeEach(() => {
     serverlessES = createServerlessES();
     serverlessKibana = createServerlessKibana();
@@ -28,6 +28,7 @@ describe('smoke', () => {
   });
   test('it can start Kibana and ES serverless', async () => {
     async function doIt() {
+      console.log('ES STARTING');
       await serverlessES.start();
       console.log('ES STARTED');
       await serverlessKibana.preboot();