1

tests/e2e/docker-compose.override.yml

@@ -0,0 +1,5 @@
+services:
+  test-runner:
+    depends_on:
+      devstar:
+        condition: service_healthy

tests/e2e/run-e2e-tests.sh

@@ -49,7 +49,9 @@ if [ -n "$TARGET_URL" ]; then
     export DEVSTAR_URL=$TARGET_URL
     # 2. [关键] 只启动 test-runner 服务
     # 我们不需要 devstar, 也不需要 --abort-on-container-exit
-    docker compose -f tests/e2e/docker-compose.test.yml up \
+    command docker compose \
+      -f tests/e2e/docker-compose.test.yml \
+      up \
       --build \
       --exit-code-from test-runner \
       test-runner
@@ -61,9 +63,12 @@ else
     export DEVSTAR_URL="http://devstar:3000"
     echo "即将执行: docker compose -f tests/e2e/docker-compose.test.yml up --build --wait --exit-code-from test-runner"
     # 2. [关键] 运行你原来的命令, 启动所有服务
-    docker compose -f tests/e2e/docker-compose.test.yml up \
+    command docker compose \
+      -f tests/e2e/docker-compose.test.yml \
+      -f tests/e2e/docker-compose.override.yml \
+      up \
       --build \
-      --wait \
+      --abort-on-container-exit \
       --exit-code-from test-runner
 fi
 
@@ -74,7 +79,7 @@ echo ""
 
 echo "===== [5/5] 测试运行完成 ====="
 echo "HTML 报告已生成在: ./reports/html"
-ls -l ./reports/html
+ls -l ./tests/e2e/reports/html
 echo ""
 
 # 以 test-runner 的退出码退出