vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-06-29 11:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(e2e): forward gateway network client limits

Browse Source
This commit is contained in:
Vincent Koc
2026-06-19 02:26:29 +02:00
parent ba69d4fb03
commit d04cedb9fe
2 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/e2e/gateway-network-docker.sh
View File

@@ -12,6 +12,22 @@ NET_NAME="openclaw-net-e2e-$$"
GW_NAME="openclaw-gateway-e2e-$$"
DOCKER_COMMAND_TIMEOUT="${OPENCLAW_GATEWAY_NETWORK_DOCKER_COMMAND_TIMEOUT:-600s}"
CLIENT_TIMEOUT="${OPENCLAW_GATEWAY_NETWORK_CLIENT_TIMEOUT:-90s}"
CLIENT_LIMIT_ENV_ARGS=()
if [[ -n "${OPENCLAW_GATEWAY_NETWORK_CLIENT_CONNECT_TIMEOUT_MS+x}" ]]; then
CLIENT_CONNECT_TIMEOUT_MS="$(
docker_e2e_read_positive_int_env OPENCLAW_GATEWAY_NETWORK_CLIENT_CONNECT_TIMEOUT_MS 80000
)"
CLIENT_LIMIT_ENV_ARGS+=(
-e "OPENCLAW_GATEWAY_NETWORK_CLIENT_CONNECT_TIMEOUT_MS=$CLIENT_CONNECT_TIMEOUT_MS"
)
elif [[ -n "${OPENCLAW_GATEWAY_NETWORK_CONNECT_READY_TIMEOUT_MS+x}" ]]; then
CONNECT_READY_TIMEOUT_MS="$(
docker_e2e_read_positive_int_env OPENCLAW_GATEWAY_NETWORK_CONNECT_READY_TIMEOUT_MS 80000
)"
CLIENT_LIMIT_ENV_ARGS+=(
-e "OPENCLAW_GATEWAY_NETWORK_CONNECT_READY_TIMEOUT_MS=$CONNECT_READY_TIMEOUT_MS"
)
fi
cleanup() {
docker_e2e_docker_cmd rm -f "$GW_NAME" >/dev/null 2>&1 || true
@@ -49,6 +65,7 @@ echo "Running client container (connect + health)..."
DOCKER_COMMAND_TIMEOUT="$CLIENT_TIMEOUT" run_logged gateway-network-client docker_e2e_docker_run_cmd run --rm \
"${DOCKER_E2E_HARNESS_ARGS[@]}" \
--network "$NET_NAME" \
"${CLIENT_LIMIT_ENV_ARGS[@]}" \
-e "GW_URL=ws://$GW_NAME:$PORT" \
-e "GW_TOKEN=$TOKEN" \
"$IMAGE_NAME" \

39
test/scripts/docker-build-helper.test.ts
View File

@@ -3387,6 +3387,45 @@ output="$(cat "$sampler_log")"
);
});
it.each([
["connect", "OPENCLAW_GATEWAY_NETWORK_CLIENT_CONNECT_TIMEOUT_MS", "100ms"],
["ready", "OPENCLAW_GATEWAY_NETWORK_CONNECT_READY_TIMEOUT_MS", "1e3"],
])(
"rejects invalid gateway network client %s timeout before Docker setup",
(_label, envName, value) => {
const result = spawnSync("bash", [GATEWAY_NETWORK_DOCKER_E2E_PATH], {
encoding: "utf8",
env: {
...process.env,
[envName]: value,
OPENCLAW_SKIP_DOCKER_BUILD: "1",
},
});
expect(result.status).toBe(2);
expect(result.stderr).toContain(`invalid ${envName}: ${value}`);
expect(result.stderr).not.toContain("Docker image not found");
},
);
it("forwards gateway network client timeout env into the Docker client", () => {
const runner = readFileSync(GATEWAY_NETWORK_DOCKER_E2E_PATH, "utf8");
expect(runner).toContain(
"docker_e2e_read_positive_int_env OPENCLAW_GATEWAY_NETWORK_CLIENT_CONNECT_TIMEOUT_MS 80000",
);
expect(runner).toContain(
"docker_e2e_read_positive_int_env OPENCLAW_GATEWAY_NETWORK_CONNECT_READY_TIMEOUT_MS 80000",
);
expect(runner).toContain(
'-e "OPENCLAW_GATEWAY_NETWORK_CLIENT_CONNECT_TIMEOUT_MS=$CLIENT_CONNECT_TIMEOUT_MS"',
);
expect(runner).toContain(
'-e "OPENCLAW_GATEWAY_NETWORK_CONNECT_READY_TIMEOUT_MS=$CONNECT_READY_TIMEOUT_MS"',
);
expect(runner).toContain('"${CLIENT_LIMIT_ENV_ARGS[@]}"');
});
it("requires TCP readiness for the gateway network runner", () => {
const runner = readFileSync(GATEWAY_NETWORK_DOCKER_E2E_PATH, "utf8");