From 4f699c92cd2b938f85600888e5f031fe68a06b62 Mon Sep 17 00:00:00 2001
From: Michael Geers <michael@geers.tv>
Date: Tue, 16 Sep 2025 14:15:11 +0200
Subject: [PATCH] chore: playwright stability (2) (#23634)

---
 playwright.config.js           |  2 +-
 tests/auth.spec.ts             |  3 +++
 tests/demo.spec.ts             |  2 +-
 tests/evcc.ts                  | 29 ++++++++++++++++++++---------
 tests/vehicle-settings.spec.ts |  1 +
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/playwright.config.js b/playwright.config.js
index 114cd6dea..b711268ae 100644
--- a/playwright.config.js
+++ b/playwright.config.js
@@ -7,7 +7,7 @@ export default defineConfig({
   testDir: "./tests",
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 4 : 0,
-  timeout: 30000, // default 30s
+  timeout: 60000, // 60s
   reporter: [[process.env.CI ? "github" : "list"], ["html", { open: "never" }]],
   use: {
     baseURL: "http://127.0.0.1:7070",
diff --git a/tests/auth.spec.ts b/tests/auth.spec.ts
index b69f84da2..28d8121cd 100644
--- a/tests/auth.spec.ts
+++ b/tests/auth.spec.ts
@@ -133,6 +133,9 @@ test("update password", async ({ page }) => {
   await page.getByRole("button", { name: "Logout" }).click();
   await expectTopNavigationClosed(page);
 
+  // should be redirected to home page after logout
+  await expect(page).toHaveURL("/#/");
+
   // login modal
   await openTopNavigation(page);
   await expect(page.getByRole("button", { name: "Logout" })).not.toBeVisible();
diff --git a/tests/demo.spec.ts b/tests/demo.spec.ts
index 889c942f2..8fb477741 100644
--- a/tests/demo.spec.ts
+++ b/tests/demo.spec.ts
@@ -5,7 +5,7 @@ import { ChildProcess } from "child_process";
 
 test.use({ baseURL: baseUrl() });
 
-let instance: ChildProcess;
+let instance: ChildProcess | undefined;
 
 test.beforeAll(async () => {
   instance = await start(undefined, undefined, "--demo");
diff --git a/tests/evcc.ts b/tests/evcc.ts
index 34d354f37..e21f1b993 100644
--- a/tests/evcc.ts
+++ b/tests/evcc.ts
@@ -6,10 +6,14 @@ import killPort from "kill-port";
 import os from "os";
 import path from "path";
 import { Transform } from "stream";
+import { test } from "@playwright/test";
 
 const BINARY = "./evcc";
-const LOG_ENABLED = !process.env["GITHUB_ACTIONS"];
-const STARTUP_TIMEOUT = 60000; // 60 seconds for evcc startup operations
+const IS_CI = !!process.env["GITHUB_ACTIONS"];
+const LOG_ENABLED = !IS_CI;
+
+// sometimes evcc startup fails due to infra issues in runner ususally fixed by retry. allowing some fails to avoid github annotations clutter
+let allowedStartupFails = IS_CI ? 2 : 0;
 
 function workerPort() {
   const index = Number(process.env["TEST_WORKER_INDEX"] ?? 0);
@@ -93,12 +97,7 @@ async function _start(config?: string, flags: string | string[] = []) {
   const port = workerPort();
   log(`wait until port ${port} is available`);
   // wait for port to be available
-  await waitOn({
-    resources: [`tcp:${port}`],
-    reverse: true,
-    log: LOG_ENABLED,
-    timeout: STARTUP_TIMEOUT,
-  });
+  await waitOn({ resources: [`tcp:${port}`], reverse: true, log: LOG_ENABLED });
   const additionalFlags = typeof flags === "string" ? [flags] : flags;
   additionalFlags.push("--log", "debug,httpd:trace");
   log("starting evcc", { config, port, additionalFlags });
@@ -113,7 +112,19 @@ async function _start(config?: string, flags: string | string[] = []) {
     log("evcc terminated", { code, port, config });
     steamLog.end();
   });
-  await waitOn({ resources: [baseUrl()], log: LOG_ENABLED, timeout: STARTUP_TIMEOUT });
+  try {
+    await waitOn({ resources: [baseUrl()], log: LOG_ENABLED, timeout: 50000 });
+  } catch (error) {
+    instance.kill("SIGKILL");
+    console.error(logPrefix(), `evcc startup failed: ${error}`);
+
+    if (allowedStartupFails > 0) {
+      allowedStartupFails--;
+      test.skip(true, `evcc startup timeout (${allowedStartupFails} skips remaining)`);
+      return;
+    }
+    throw error;
+  }
   return instance;
 }
 
diff --git a/tests/vehicle-settings.spec.ts b/tests/vehicle-settings.spec.ts
index 519a61993..c3b322c60 100644
--- a/tests/vehicle-settings.spec.ts
+++ b/tests/vehicle-settings.spec.ts
@@ -90,6 +90,7 @@ test.describe("limitSoc", async () => {
     await expectModalHidden(modal);
     await expect(page.getByTestId("limit-soc-value")).toContainText("80%");
     await page.waitForLoadState("networkidle");
+    await page.waitForTimeout(500); // bad practice but may help here :/
 
     await restart(simulatorConfig());
     await page.reload();