






















@@ -681,12 +681,14 @@ test -f "$TMPDIR/docker-cmd-seen"
681681});
682682683683it("cleans resource-sampled Docker E2E temp logs on every exit path", () => {
684-for (const path of [
685-ONBOARD_DOCKER_E2E_PATH,
686-KITCHEN_SINK_PLUGIN_DOCKER_E2E_PATH,
687-KITCHEN_SINK_RPC_DOCKER_E2E_PATH,
684+for (const { path, label } of [
685+{ path: ONBOARD_DOCKER_E2E_PATH, label: "onboard" },
686+{ path: KITCHEN_SINK_PLUGIN_DOCKER_E2E_PATH, label: "kitchen-sink" },
687+{ path: KITCHEN_SINK_RPC_DOCKER_E2E_PATH, label: "kitchen-sink-rpc" },
688688]) {
689689const runner = readFileSync(path, "utf8");
690+const resourceAssertion =
691+`node scripts/e2e/lib/docker-stats/assert-resource-ceiling.mjs "$STATS_LOG" "$MAX_MEMORY_MIB" "$MAX_CPU_PERCENT" ${label}`;
690692691693expect(runner, path).toContain('RUN_LOG="$(mktemp');
692694expect(runner, path).toContain('STATS_LOG="$(mktemp');
@@ -699,6 +701,9 @@ test -f "$TMPDIR/docker-cmd-seen"
699701expect(runner, path).not.toMatch(/(^|\n)docker run --name "\$CONTAINER_NAME"/u);
700702expect(runner, path).not.toMatch(/(^|\n)docker (?:inspect|stats) /u);
701703expect(runner, path).toMatch(/cleanup\(\) \{[\s\S]*rm -f "\$RUN_LOG" "\$STATS_LOG"/u);
704+expect(runner, path).toContain(`if [ "$run_status" -eq 0 ]; then\n ${resourceAssertion}`);
705+expect(runner, path).toContain(`elif [ -s "$STATS_LOG" ]; then\n ${resourceAssertion} || true`);
706+expect(runner, path).not.toContain(`${resourceAssertion}\n\nexit "$run_status"`);
702707}
703708});
704709此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。