FI-1432 fix: Playwright timeout for test with waitBeforeRetry

joomcode · Nov 11, 2024 · a3276ca · a3276ca
1 parent da61cba
commit a3276ca
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/src/types/testRun.ts b/src/types/testRun.ts
@@ -124,6 +124,7 @@ export type TestUnit = Readonly<{
   outputDirectoryName: string;
   retryIndex: number;
   runId: RunId;
+  startTimeInMs: UtcTimeInMs;
   testController: PlaywrightTestArgs;
   testFn: TestFn;
   testStaticOptions: TestStaticOptions;

diff --git a/src/utils/test/beforeTest.ts b/src/utils/test/beforeTest.ts
@@ -25,10 +25,10 @@ const additionToPlaywrightTestTimeout = 500;
  * @internal
  */
 export const beforeTest = ({
-  beforeRetryTimeout,
   outputDirectoryName,
   retryIndex,
   runId,
+  startTimeInMs,
   testFn,
   testStaticOptions,
 }: TestUnit): void => {
@@ -47,7 +47,7 @@ export const beforeTest = ({
   const testIdleTimeout = options.testIdleTimeout ?? testIdleTimeoutFromConfig;
   const testTimeout = options.testTimeout ?? testTimeoutFromConfig;
 
-  test.setTimeout(testTimeout + additionToPlaywrightTestTimeout + (beforeRetryTimeout ?? 0));
+  test.setTimeout(testTimeout + additionToPlaywrightTestTimeout + (Date.now() - startTimeInMs));
 
   setTestIdleTimeout(testIdleTimeout);
   setTestTimeout(testTimeout);

diff --git a/src/utils/test/getRunTest.ts b/src/utils/test/getRunTest.ts
@@ -13,7 +13,7 @@ import {preparePage} from './preparePage';
 import {runTestFn} from './runTestFn';
 import {waitBeforeRetry} from './waitBeforeRetry';
 
-import type {RunTest, Test, TestStaticOptions, TestUnit} from '../../types/internal';
+import type {RunTest, Test, TestStaticOptions, TestUnit, UtcTimeInMs} from '../../types/internal';
 
 /**
  * Get complete run test function by the complete test options.
@@ -23,6 +23,7 @@ export const getRunTest =
   (test: Test): RunTest =>
   ({context, page, request}, testInfo): Promise<void> => {
     const runTest = async (): Promise<void> => {
+      const startTimeInMs = Date.now() as UtcTimeInMs;
       const retryIndex = testInfo.retry + 1;
       const runId = createRunId(test, retryIndex);
 
@@ -34,29 +35,25 @@ export const getRunTest =
 
       try {
         testStaticOptions = getTestStaticOptions(test, testInfo);
-
         shouldRunTest = await getShouldRunTest(testStaticOptions);
 
         if (!shouldRunTest) {
           return;
         }
 
-        const beforeRetryTimeout = await waitBeforeRetry(runId, testStaticOptions);
-
-        clearPage = await preparePage(page);
-
-        const testController = {context, page, request};
-
         const testUnit: TestUnit = {
-          beforeRetryTimeout,
+          beforeRetryTimeout: await waitBeforeRetry(runId, testStaticOptions),
           outputDirectoryName: getOutputDirectoryName(testInfo.outputDir),
           retryIndex,
           runId,
-          testController,
+          startTimeInMs,
+          testController: {context, page, request},
           testFn: test.testFn,
           testStaticOptions,
         };
 
+        clearPage = await preparePage(page);
+
         beforeTest(testUnit);
 
         await runTestFn(testUnit);

diff --git a/src/utils/test/waitBeforeRetry.ts b/src/utils/test/waitBeforeRetry.ts
@@ -9,7 +9,7 @@ import type {FullTestRun, RunId, TestStaticOptions} from '../../types/internal';
 
 import {test} from '@playwright/test';
 
-const additionToTimeout = 500;
+const additionToTimeout = 10_000;
 
 /**
  * Waits before running test for some time from pack config (for retries).