mirror of
https://github.com/openclaw/openclaw.git
synced 2026-08-06 18:12:13 +00:00
fix(e2e): validate plugin fixture stop attempts
This commit is contained in:
@@ -2,6 +2,20 @@ OPENCLAW_PLUGINS_FIXTURE_PID_FILES=()
|
||||
OPENCLAW_PLUGINS_FIXTURE_EXIT_TRAP_INSTALLED=0
|
||||
OPENCLAW_PLUGINS_FIXTURE_PREVIOUS_EXIT_ACTION=""
|
||||
|
||||
openclaw_plugins_read_positive_int_env() {
|
||||
local name="${1:?missing environment variable name}"
|
||||
local fallback="${2:?missing fallback value}"
|
||||
local value="${!name-}"
|
||||
if [[ -z "${!name+x}" ]]; then
|
||||
value="$fallback"
|
||||
fi
|
||||
if [[ ! "$value" =~ ^[0-9]+$ ]] || (( 10#$value < 1 )); then
|
||||
echo "invalid $name: $value" >&2
|
||||
return 2
|
||||
fi
|
||||
printf "%s\n" "$((10#$value))"
|
||||
}
|
||||
|
||||
openclaw_plugins_cleanup_fixture_servers() {
|
||||
local pid_file
|
||||
local pid
|
||||
@@ -33,7 +47,8 @@ openclaw_plugins_fixture_process_alive() {
|
||||
openclaw_plugins_stop_fixture_process() {
|
||||
local pid="$1"
|
||||
local _
|
||||
local attempts="${OPENCLAW_PLUGINS_FIXTURE_STOP_ATTEMPTS:-40}"
|
||||
local attempts
|
||||
attempts="$(openclaw_plugins_read_positive_int_env OPENCLAW_PLUGINS_FIXTURE_STOP_ATTEMPTS 40)" || return $?
|
||||
local interval="${OPENCLAW_PLUGINS_FIXTURE_STOP_INTERVAL_SECONDS:-0.25}"
|
||||
if declare -F openclaw_e2e_stop_process >/dev/null 2>&1; then
|
||||
openclaw_e2e_stop_process "$pid"
|
||||
|
||||
@@ -390,6 +390,39 @@ test -d "$OPENCLAW_PLUGINS_TMP_DIR"
|
||||
}
|
||||
});
|
||||
|
||||
it("rejects invalid fixture stop attempts before cleanup polling", () => {
|
||||
const result = spawnSync(
|
||||
"/bin/bash",
|
||||
[
|
||||
"-c",
|
||||
[
|
||||
"set -euo pipefail",
|
||||
"source scripts/e2e/lib/plugins/fixtures.sh",
|
||||
"openclaw_plugins_signal_fixture_process() { echo signal; }",
|
||||
"openclaw_plugins_fixture_process_alive() { echo probe; return 1; }",
|
||||
"set +e",
|
||||
"openclaw_plugins_stop_fixture_process 12345",
|
||||
'status="$?"',
|
||||
"set -e",
|
||||
'exit "$status"',
|
||||
].join("\n"),
|
||||
],
|
||||
{
|
||||
cwd: process.cwd(),
|
||||
encoding: "utf8",
|
||||
env: {
|
||||
...process.env,
|
||||
OPENCLAW_PLUGINS_FIXTURE_STOP_ATTEMPTS: "2x",
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
expect(result.status).toBe(2);
|
||||
expect(result.stderr).toContain("invalid OPENCLAW_PLUGINS_FIXTURE_STOP_ATTEMPTS: 2x");
|
||||
expect(result.stdout).not.toContain("signal");
|
||||
expect(result.stdout).not.toContain("probe");
|
||||
});
|
||||
|
||||
it("bounds npm fixture registry logs when readiness fails", () => {
|
||||
const root = mkdtempSync(path.join(tmpdir(), "openclaw-plugin-npm-fixture-log-"));
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user