From 17fd843af6059876e7f2cfbcbf55a616a3f4d1f7 Mon Sep 17 00:00:00 2001
From: Yiheng Xu <github@ranpox.com>
Date: Mon, 8 Sep 2025 10:51:14 +0800
Subject: [PATCH] Fix E2E caused by Terminal Bench test (#529)

* fix e2e

* fix lint
---
 .github/workflows/e2e.yml                     |  1 +
 integration-tests/vitest.config.ts            |  1 +
 .../vitest.terminal-bench.config.ts           | 21 +++++++++++++++++++
 package.json                                  |  6 +++---
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 integration-tests/vitest.terminal-bench.config.ts

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 077ba92e..fd02bb83 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'main'
+      - 'feat/e2e/**'
   merge_group:
 
 jobs:
diff --git a/integration-tests/vitest.config.ts b/integration-tests/vitest.config.ts
index 9b3709d3..888343ca 100644
--- a/integration-tests/vitest.config.ts
+++ b/integration-tests/vitest.config.ts
@@ -15,6 +15,7 @@ export default defineConfig({
     globalSetup: './globalSetup.ts',
     reporters: ['default'],
     include: ['**/*.test.ts'],
+    exclude: ['**/terminal-bench/*.test.ts', '**/node_modules/**'],
     retry: 2,
     fileParallelism: false,
   },
diff --git a/integration-tests/vitest.terminal-bench.config.ts b/integration-tests/vitest.terminal-bench.config.ts
new file mode 100644
index 00000000..f8d94753
--- /dev/null
+++ b/integration-tests/vitest.terminal-bench.config.ts
@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { defineConfig } from 'vitest/config';
+
+const timeoutMinutes = Number(process.env.TB_TIMEOUT_MINUTES || '30');
+const testTimeoutMs = timeoutMinutes * 60 * 1000;
+
+export default defineConfig({
+  test: {
+    testTimeout: testTimeoutMs,
+    globalSetup: './globalSetup.ts',
+    reporters: ['default'],
+    include: ['**/terminal-bench/*.test.ts'],
+    retry: 2,
+    fileParallelism: false,
+  },
+});
diff --git a/package.json b/package.json
index c597787b..be6a3215 100644
--- a/package.json
+++ b/package.json
@@ -37,9 +37,9 @@
     "test:integration:sandbox:none": "GEMINI_SANDBOX=false vitest run --root ./integration-tests",
     "test:integration:sandbox:docker": "GEMINI_SANDBOX=docker npm run build:sandbox && GEMINI_SANDBOX=docker vitest run --root ./integration-tests",
     "test:integration:sandbox:podman": "GEMINI_SANDBOX=podman vitest run --root ./integration-tests",
-    "test:terminal-bench": "cross-env VERBOSE=true KEEP_OUTPUT=true vitest run --root ./integration-tests terminal-bench.test.ts",
-    "test:terminal-bench:oracle": "cross-env VERBOSE=true KEEP_OUTPUT=true vitest run --root ./integration-tests terminal-bench.test.ts -t 'oracle'",
-    "test:terminal-bench:qwen": "cross-env VERBOSE=true KEEP_OUTPUT=true vitest run --root ./integration-tests terminal-bench.test.ts -t 'qwen'",
+    "test:terminal-bench": "cross-env VERBOSE=true KEEP_OUTPUT=true vitest run --config ./vitest.terminal-bench.config.ts --root ./integration-tests",
+    "test:terminal-bench:oracle": "cross-env VERBOSE=true KEEP_OUTPUT=true vitest run --config ./vitest.terminal-bench.config.ts --root ./integration-tests -t 'oracle'",
+    "test:terminal-bench:qwen": "cross-env VERBOSE=true KEEP_OUTPUT=true vitest run --config ./vitest.terminal-bench.config.ts --root ./integration-tests -t 'qwen'",
     "lint": "eslint . --ext .ts,.tsx && eslint integration-tests",
     "lint:fix": "eslint . --fix && eslint integration-tests --fix",
     "lint:ci": "eslint . --ext .ts,.tsx --max-warnings 0 && eslint integration-tests --max-warnings 0",