Take frontend/target screenshots at failure time

In instrumented test function we will preserve the screenshot error too.

Bug: 407460244
Change-Id: I870cbaccce2958639f7ab6d65e82a628fb1436f7
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6429833
Auto-Submit: Liviu Rau <[email protected]>
Commit-Queue: Simon Zünd <[email protected]>
Reviewed-by: Simon Zünd <[email protected]>

Author: Liviu Rau

test/e2e_non_hosted/conductor/mocha-interface-helpers.ts

@@ -25,14 +25,17 @@ async function createScreenshotError(test: Mocha.Runnable|undefined, error: Erro
     console.error('Missing browsing state. Unable to take screenshots for the error:', error);
     return error;
   }
-  const sate = test.parent.state;
+  return await screenshotError(test.parent.state, error);
+}
+
+export async function screenshotError(state: E2E.State, error: Error) {
   console.error('Taking screenshots for the error:', error);
   if (!TestConfig.debug) {
     try {
       const screenshotTimeout = 5_000;
       let timer: ReturnType<typeof setTimeout>;
       const {target, frontend} = await Promise.race([
-        takeScreenshots(sate).then(result => {
+        takeScreenshots(state).then(result => {
           clearTimeout(timer);
           return result;
         }),
@@ -89,7 +92,7 @@ export function makeInstrumentedTestFunction(fn: Mocha.AsyncFunc, label: string)
               if (abortController.signal.aborted) {
                 return;
               }
-              reject(await createScreenshotError(this.test, err));
+              reject(err instanceof ScreenshotError ? err : await createScreenshotError(this.test, err));
             })
         .finally(() => {
           clearTimeout(t);

test/e2e_non_hosted/conductor/state-provider.ts

@@ -13,6 +13,8 @@ import {type BrowserWrapper, DEFAULT_BROWSER_SETTINGS, Launcher} from '../shared
 import {DEFAULT_DEVTOOLS_SETTINGS, setupDevToolsPage} from '../shared/frontend-helper.js';
 import {setupInspectedPage} from '../shared/target-helper.js';
 
+import {screenshotError} from './mocha-interface-helpers.js';
+
 const DEFAULT_SETTINGS = {
   ...DEFAULT_BROWSER_SETTINGS,
   ...DEFAULT_DEVTOOLS_SETTINGS
@@ -38,6 +40,8 @@ export class StateProvider {
       // eslint-disable-next-line no-debugger
       debugger;  // If you're paused here while debugging, stepping into the next line will step into your test.
       return await testFn.call(context, state);
+    } catch (e) {
+      throw await screenshotError(state, e);
     } finally {
       await browsingContext.close();
       dumpCollectedErrors();