From 7ef35f47c41710c433647bd7a940168161f2418a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 14 Feb 2025 12:01:05 +0000
Subject: [PATCH] test: reduce flakiness of `reuse-dep-optimization-cache` e2e
 test

This commit reduces test flakiness by modifying the logic to perform the fetch only after the app is bundled.
---
 .../vite/reuse-dep-optimization-cache.ts      | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/vite/reuse-dep-optimization-cache.ts b/tests/legacy-cli/e2e/tests/vite/reuse-dep-optimization-cache.ts
index c7c03be87e2c..ddcbe5e60d20 100644
--- a/tests/legacy-cli/e2e/tests/vite/reuse-dep-optimization-cache.ts
+++ b/tests/legacy-cli/e2e/tests/vite/reuse-dep-optimization-cache.ts
@@ -1,23 +1,28 @@
 import assert from 'node:assert';
-import { setTimeout } from 'node:timers/promises';
 import { findFreePort } from '../../utils/network';
-import { execAndWaitForOutputToMatch, killAllProcesses, ng } from '../../utils/process';
+import {
+  execAndWaitForOutputToMatch,
+  killAllProcesses,
+  ng,
+  waitForAnyProcessOutputToMatch,
+} from '../../utils/process';
 
 export default async function () {
   await ng('cache', 'clean');
   await ng('cache', 'on');
 
   const port = await findFreePort();
+  await execAndWaitForOutputToMatch(
+    'ng',
+    ['serve', '--port', `${port}`],
+    /Application bundle generation complete/,
+    // Use CI:0 to force caching
+    { DEBUG: 'vite:deps', CI: '0', NO_COLOR: 'true' },
+  );
 
   const [, response] = await Promise.all([
-    execAndWaitForOutputToMatch(
-      'ng',
-      ['serve', '--port', `${port}`],
-      /dependencies optimized/,
-      // Use CI:0 to force caching
-      { DEBUG: 'vite:deps', CI: '0', NO_COLOR: 'true' },
-    ),
-    setTimeout(4_000).then(() => fetch(`http://localhost:${port}/main.js`)),
+    waitForAnyProcessOutputToMatch(/dependencies optimized/, 10_000),
+    fetch(`http://localhost:${port}/main.js`),
   ]);
 
   assert(response.ok, `Expected 'response.ok' to be 'true'.`);