From 2c6bf1a5d8997593e0ebb004edc3ca94a69ccf23 Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Fri, 19 Jun 2026 03:10:01 +0200 Subject: [PATCH] fix(e2e): forward codex media log limit --- scripts/e2e/codex-media-path-docker.sh | 2 ++ test/scripts/docker-build-helper.test.ts | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/scripts/e2e/codex-media-path-docker.sh b/scripts/e2e/codex-media-path-docker.sh index e4c50e18032f..df8732f354d6 100644 --- a/scripts/e2e/codex-media-path-docker.sh +++ b/scripts/e2e/codex-media-path-docker.sh @@ -7,6 +7,7 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-image.sh" IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-codex-media-path-e2e" OPENCLAW_CODEX_MEDIA_PATH_E2E_IMAGE)" PORT="$(docker_e2e_read_tcp_port_env OPENCLAW_CODEX_MEDIA_PATH_PORT 18790)" TIMEOUT_SECONDS="$(docker_e2e_read_positive_int_env OPENCLAW_CODEX_MEDIA_PATH_TIMEOUT_SECONDS 180)" +LOG_TAIL_MAX_BYTES="$(docker_e2e_read_positive_int_env OPENCLAW_CODEX_MEDIA_PATH_LOG_TAIL_MAX_BYTES 2097152)" TOKEN="codex-media-path-e2e-$$" CODEX_PLUGIN_SPEC="${OPENCLAW_CODEX_MEDIA_PATH_PLUGIN_SPEC:-npm:@openclaw/codex}" @@ -17,6 +18,7 @@ echo "Running Codex media-path Docker E2E..." docker_e2e_run_logged_with_harness codex-media-path \ -e COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \ -e "OPENCLAW_CODEX_MEDIA_PATH_PLUGIN_SPEC=$CODEX_PLUGIN_SPEC" \ + -e "OPENCLAW_CODEX_MEDIA_PATH_LOG_TAIL_MAX_BYTES=$LOG_TAIL_MAX_BYTES" \ -e "OPENCLAW_CODEX_MEDIA_PATH_TIMEOUT_SECONDS=$TIMEOUT_SECONDS" \ -e "OPENCLAW_ALLOW_INSECURE_PRIVATE_WS=1" \ -e "OPENCLAW_GATEWAY_TOKEN=$TOKEN" \ diff --git a/test/scripts/docker-build-helper.test.ts b/test/scripts/docker-build-helper.test.ts index 0e62dafa4a2b..7c7962592620 100644 --- a/test/scripts/docker-build-helper.test.ts +++ b/test/scripts/docker-build-helper.test.ts @@ -3374,21 +3374,35 @@ output="$(cat "$sampler_log")" expect(result.stderr).not.toContain("OPENAI_API_KEY was not available"); }); - it("rejects invalid Codex media path Docker timeouts before Docker setup", () => { + it.each([ + ["timeout", "OPENCLAW_CODEX_MEDIA_PATH_TIMEOUT_SECONDS", "180s"], + ["log tail cap", "OPENCLAW_CODEX_MEDIA_PATH_LOG_TAIL_MAX_BYTES", "64kb"], + ])("rejects invalid Codex media path Docker %s before Docker setup", (_label, envName, value) => { const result = spawnSync("bash", [CODEX_MEDIA_PATH_DOCKER_E2E_PATH], { encoding: "utf8", env: { ...process.env, - OPENCLAW_CODEX_MEDIA_PATH_TIMEOUT_SECONDS: "180s", + [envName]: value, OPENCLAW_SKIP_DOCKER_BUILD: "1", }, }); expect(result.status).toBe(2); - expect(result.stderr).toContain("invalid OPENCLAW_CODEX_MEDIA_PATH_TIMEOUT_SECONDS: 180s"); + expect(result.stderr).toContain(`invalid ${envName}: ${value}`); expect(result.stderr).not.toContain("Docker image not found"); }); + it("forwards Codex media path client limits into Docker", () => { + const runner = readFileSync(CODEX_MEDIA_PATH_DOCKER_E2E_PATH, "utf8"); + + expect(runner).toContain( + 'LOG_TAIL_MAX_BYTES="$(docker_e2e_read_positive_int_env OPENCLAW_CODEX_MEDIA_PATH_LOG_TAIL_MAX_BYTES 2097152)"', + ); + expect(runner).toContain( + '-e "OPENCLAW_CODEX_MEDIA_PATH_LOG_TAIL_MAX_BYTES=$LOG_TAIL_MAX_BYTES"', + ); + }); + it.each([ [MCP_CODE_MODE_GATEWAY_DOCKER_E2E_PATH, "OPENCLAW_MCP_CODE_MODE_CLIENT_TIMEOUT_MS", "1e3"], [