FI-1721 fix: save reports after errors in doBeforePack/doAfterPack

Author: uid11

src/utils/events/registerEndE2edRunEvent.ts

@@ -17,6 +17,7 @@ let isEndAlreadyCalled = false;
  * Registers end e2ed run event (for report) after closing of all tests.
  * @internal
  */
+// eslint-disable-next-line max-statements
 export const registerEndE2edRunEvent = async (): Promise<void> => {
   if (isEndAlreadyCalled) {
     return;
@@ -47,6 +48,7 @@ export const registerEndE2edRunEvent = async (): Promise<void> => {
     } catch (error) {
       generalLog('Caught an error on run "after pack" functions', {error});
 
+      setReadonlyProperty(liteReport, 'exitCode', ExitCode.HasErrorsInDoAfterPackFunctions);
       setReadonlyProperty(reportData, 'exitCode', ExitCode.HasErrorsInDoAfterPackFunctions);
     }
 

src/utils/events/registerStartE2edRunEvent.ts

@@ -53,35 +53,37 @@ export const registerStartE2edRunEvent = async (): Promise<void> => {
   const startInfo = getStartInfo({configCompileTimeWithUnits});
 
   try {
-    await runBeforePackFunctions(startInfo);
-  } catch (cause) {
-    setGlobalExitCode(ExitCode.HasErrorsInDoBeforePackFunctions);
-
-    throw new E2edError('Caught an error on running "before pack" functions', {cause});
-  }
+    try {
+      await runBeforePackFunctions(startInfo);
+    } catch (cause) {
+      setGlobalExitCode(ExitCode.HasErrorsInDoBeforePackFunctions);
 
-  const fullPackConfig = getFullPackConfig();
+      throw new E2edError('Caught an error on running "before pack" functions', {cause});
+    }
 
-  updateConfig(fullPackConfig, startInfo);
+    const fullPackConfig = getFullPackConfig();
 
-  if (errorSettingDotEnv !== undefined) {
-    generalLog('Caught an error on setting environment variables from `variables.env` file', {
-      errorSettingDotEnv,
-    });
-  }
+    updateConfig(fullPackConfig, startInfo);
 
-  if (compileErrors.length !== 0) {
-    const pathToPack = getPathToPack();
+    if (errorSettingDotEnv !== undefined) {
+      generalLog('Caught an error on setting environment variables from `variables.env` file', {
+        errorSettingDotEnv,
+      });
+    }
 
-    generalLog(`Caught errors on compiling pack ${pathToPack}`, {compileErrors});
-  }
+    if (compileErrors.length !== 0) {
+      const pathToPack = getPathToPack();
 
-  const {e2ed, runEnvironment} = startInfo;
-  const isLocalRun = runEnvironment !== RunEnvironment.Docker;
-  const startMessage = `Run tests ${isLocalRun ? 'local' : 'in docker'} with e2ed@${e2ed.version}`;
+      generalLog(`Caught errors on compiling pack ${pathToPack}`, {compileErrors});
+    }
 
-  generalLog(startMessage, startInfo);
+    const {e2ed, runEnvironment} = startInfo;
+    const isLocalRun = runEnvironment !== RunEnvironment.Docker;
+    const startMessage = `Run tests ${isLocalRun ? 'local' : 'in docker'} with e2ed@${e2ed.version}`;
 
-  await writeStartInfo(startInfo);
-  await writeLogsToFile();
+    generalLog(startMessage, startInfo);
+  } finally {
+    await writeStartInfo(startInfo);
+    await writeLogsToFile();
+  }
 };

src/utils/exit/getExitCode.ts

@@ -2,13 +2,21 @@ import {ExitCode, FAILED_TEST_RUN_STATUSES} from '../../constants/internal';
 
 import {assertValueIsDefined} from '../asserts';
 
+import {getGlobalExitCode} from './globalExitCode';
+
 import type {Retry} from '../../types/internal';
 
 /**
  * Get e2ed exit code by `hasError` flag and array of retries.
  * @internal
  */
 export const getExitCode = (hasError: boolean, retries: readonly Retry[]): ExitCode => {
+  const globalExitCode = getGlobalExitCode();
+
+  if (globalExitCode !== undefined) {
+    return globalExitCode;
+  }
+
   if (hasError) {
     return ExitCode.HasErrors;
   }