Fix screenshot error message

The timer was not cancelled resulting in the error message
"Could not take screenshots within X ms" being always printed.

Bug: none
Change-Id: Ibb81ad1b60f185a3704ba61ad7ab783453201fc3
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6072805
Commit-Queue: Alex Rudenko <[email protected]>
Auto-Submit: Alex Rudenko <[email protected]>
Reviewed-by: Simon Zünd <[email protected]>
Commit-Queue: Simon Zünd <[email protected]>

Author: OrKoN

test/conductor/mocha-interface-helpers.ts

@@ -62,13 +62,17 @@ async function takeScreenshots(): Promise<{target?: string, frontend?: string}>
 }
 
 async function createScreenshotError(error: Error): Promise<Error> {
-  console.error('Taking screenshots for the error', error);
+  console.error('Taking screenshots for the error:', error);
   if (!TestConfig.debug) {
     const screenshotTimeout = 5_000;
+    let timer: NodeJS.Timeout;
     const {target, frontend} = await Promise.race([
-      takeScreenshots(),
+      takeScreenshots().then(result => {
+        clearTimeout(timer);
+        return result;
+      }),
       new Promise(resolve => {
-        setTimeout(resolve, screenshotTimeout);
+        timer = setTimeout(resolve, screenshotTimeout);
       }).then(() => {
         console.error(`Could not take screenshots within ${screenshotTimeout}ms.`);
         return {target: undefined, frontend: undefined};