From 6d542ebceeb044211ab207d588c0144b076e62f6 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Tue, 28 Apr 2026 19:50:51 +0100 Subject: [PATCH] test: clean up Docker test-state leftovers --- scripts/e2e/onboard-docker.sh | 4 ---- scripts/e2e/plugin-update-unchanged-docker.sh | 14 +++----------- .../scripts/plugin-update-unchanged-docker.test.ts | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/scripts/e2e/onboard-docker.sh b/scripts/e2e/onboard-docker.sh index 5ff30850fe8..1c42a81bf49 100755 --- a/scripts/e2e/onboard-docker.sh +++ b/scripts/e2e/onboard-docker.sh @@ -224,10 +224,6 @@ TRASH run_wizard_cmd "$case_name" "$home_dir" "node \"$OPENCLAW_ENTRY\" onboard $ONBOARD_FLAGS" "$send_fn" true "$validate_fn" } - make_home() { - mktemp -d "/tmp/openclaw-e2e-$1.XXXXXX" - } - set_isolated_openclaw_env() { local label="$1" openclaw_test_state_create "$label" empty diff --git a/scripts/e2e/plugin-update-unchanged-docker.sh b/scripts/e2e/plugin-update-unchanged-docker.sh index 803867b0286..37dc30defe3 100755 --- a/scripts/e2e/plugin-update-unchanged-docker.sh +++ b/scripts/e2e/plugin-update-unchanged-docker.sh @@ -43,19 +43,11 @@ cat > \"\$HOME/.openclaw/extensions/lossless-claw/package.json\" <<'JSON' \"version\": \"0.9.0\" } JSON -if [ \"\$OPENCLAW_PACKAGE_ACCEPTANCE_LEGACY_COMPAT\" = \"1\" ]; then - cat > \"\$HOME/.openclaw/openclaw.json\" <<'JSON' +cat > \"\$OPENCLAW_CONFIG_PATH\" <<'JSON' { \"plugins\": {} } JSON -else - cat > \"\$HOME/.openclaw/openclaw.json\" <<'JSON' -{ - \"plugins\": {} -} -JSON -fi mkdir -p \"\$HOME/.openclaw/plugins\" cat > \"\$HOME/.openclaw/plugins/installs.json\" <<'JSON' { @@ -144,7 +136,7 @@ fi before_config_hash=\"\" if [ \"\$OPENCLAW_PACKAGE_ACCEPTANCE_LEGACY_COMPAT\" != \"1\" ]; then - before_config_hash=\$(sha256sum \"\$HOME/.openclaw/openclaw.json\" | awk '{print \$1}') + before_config_hash=\$(sha256sum \"\$OPENCLAW_CONFIG_PATH\" | awk '{print \$1}') fi node --input-type=module > /tmp/plugin-update-before.json <<'NODE' @@ -182,7 +174,7 @@ NODE node \"\$entry\" plugins update @example/lossless-claw > /tmp/plugin-update-output.log 2>&1 if [ -n \"\$before_config_hash\" ]; then - after_config_hash=\$(sha256sum \"\$HOME/.openclaw/openclaw.json\" | awk '{print \$1}') + after_config_hash=\$(sha256sum \"\$OPENCLAW_CONFIG_PATH\" | awk '{print \$1}') if [ \"\$before_config_hash\" != \"\$after_config_hash\" ]; then echo \"Config changed unexpectedly for modern package \$package_version\" cat /tmp/plugin-update-output.log diff --git a/test/scripts/plugin-update-unchanged-docker.test.ts b/test/scripts/plugin-update-unchanged-docker.test.ts index 848edde9e34..a045eb27fb3 100644 --- a/test/scripts/plugin-update-unchanged-docker.test.ts +++ b/test/scripts/plugin-update-unchanged-docker.test.ts @@ -6,7 +6,7 @@ const PLUGIN_UPDATE_DOCKER_SCRIPT = "scripts/e2e/plugin-update-unchanged-docker. describe("plugin update unchanged Docker E2E", () => { it("seeds current plugin install ledger state before checking config stability", () => { const script = readFileSync(PLUGIN_UPDATE_DOCKER_SCRIPT, "utf8"); - const configSeedStart = script.indexOf('cat > \\"\\$HOME/.openclaw/openclaw.json\\"'); + const configSeedStart = script.indexOf('cat > \\"\\$OPENCLAW_CONFIG_PATH\\"'); const configSeedEnd = script.indexOf('cat > \\"\\$HOME/.openclaw/plugins/installs.json\\"'); const configSeed = script.slice(configSeedStart, configSeedEnd);