From 440f315e83e4bd55f2564457310429ec6eab67ce Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Sun, 7 Jun 2026 10:33:14 +0200 Subject: [PATCH] fix(e2e): bound update channel logs --- scripts/e2e/update-channel-switch-docker.sh | 4 ++-- test/scripts/docker-build-helper.test.ts | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/e2e/update-channel-switch-docker.sh b/scripts/e2e/update-channel-switch-docker.sh index f52ab1a93add..890517d7be61 100755 --- a/scripts/e2e/update-channel-switch-docker.sh +++ b/scripts/e2e/update-channel-switch-docker.sh @@ -61,7 +61,7 @@ node scripts/e2e/lib/update-channel-switch/assertions.mjs prepare-git-fixture "$ ( cd "$git_root" if ! openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install --omit=optional --no-fund --no-audit >/tmp/openclaw-git-install.log 2>&1; then - cat /tmp/openclaw-git-install.log >&2 || true + openclaw_e2e_print_log /tmp/openclaw-git-install.log >&2 exit 1 fi ) @@ -81,7 +81,7 @@ pkg_tgz_path="$package_tgz" package_install_log="/tmp/openclaw-update-channel-switch-package-install.log" if ! openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install -g --prefix /tmp/npm-prefix --omit=optional "$pkg_tgz_path" >"$package_install_log" 2>&1; then - cat "$package_install_log" >&2 || true + openclaw_e2e_print_log "$package_install_log" >&2 exit 1 fi package_version="$(node -p "JSON.parse(require(\"node:fs\").readFileSync(\"/tmp/npm-prefix/lib/node_modules/openclaw/package.json\", \"utf8\")).version")" diff --git a/test/scripts/docker-build-helper.test.ts b/test/scripts/docker-build-helper.test.ts index ab56a8a19ce9..b67def70e5a3 100644 --- a/test/scripts/docker-build-helper.test.ts +++ b/test/scripts/docker-build-helper.test.ts @@ -1478,6 +1478,10 @@ grep -qx -- "OPENCLAW_E2E_COMMAND_TIMEOUT=23s" "$TMPDIR/package-args" expect(updateChannel).toContain( 'openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install -g --prefix /tmp/npm-prefix --omit=optional "$pkg_tgz_path"', ); + expect(updateChannel).toContain("openclaw_e2e_print_log /tmp/openclaw-git-install.log"); + expect(updateChannel).toContain('openclaw_e2e_print_log "$package_install_log"'); + expect(updateChannel).not.toContain("cat /tmp/openclaw-git-install.log"); + expect(updateChannel).not.toContain('cat "$package_install_log"'); expect(doctorSwitch).toContain( 'openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install --omit=optional --no-fund --no-audit', );