vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 05:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tolerate update migration pre-doctor cleanup

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-02 00:44:26 +01:00
parent 07f523be4a
commit 683549b17f
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/e2e/lib/upgrade-survivor/run.sh
View File

@@ -342,6 +342,15 @@ seed_legacy_plugin_dependency_debris() {
assert_legacy_plugin_dependency_debris_present() {
plugin_deps_cleanup_enabled || return 0
local found
found="$(legacy_plugin_dependency_debris_count)"
if [ "$found" -eq 0 ]; then
echo "plugin-deps-cleanup scenario did not create legacy plugin dependency debris" >&2
return 1
fi
}
legacy_plugin_dependency_debris_count() {
local found=0
local plugin
for plugin in $(plugin_deps_cleanup_plugins); do
@@ -352,9 +361,18 @@ assert_legacy_plugin_dependency_debris_present() {
fi
done < <(legacy_plugin_dependency_probe_paths "$plugin")
done
if [ "$found" -ne 1 ]; then
echo "plugin-deps-cleanup scenario did not create legacy plugin dependency debris" >&2
return 1
printf '%s\n' "$found"
}
assert_legacy_plugin_dependency_debris_before_doctor() {
plugin_deps_cleanup_enabled || return 0
local found
found="$(legacy_plugin_dependency_debris_count)"
if [ "$found" -eq 0 ]; then
echo "Legacy plugin dependency debris was already removed before doctor; post-doctor cleanup assertion will verify it stays gone."
else
echo "Legacy plugin dependency debris survived update and will be cleaned by doctor."
fi
}
@@ -657,7 +675,7 @@ phase assert-baseline assert_baseline_state
phase seed-legacy-runtime-deps-symlink seed_legacy_runtime_deps_symlink
phase resolve-candidate resolve_candidate_version
phase update-candidate update_candidate
phase assert-legacy-plugin-dependency-debris-before-doctor assert_legacy_plugin_dependency_debris_present
phase assert-legacy-plugin-dependency-debris-before-doctor assert_legacy_plugin_dependency_debris_before_doctor
phase doctor run_doctor
phase assert-legacy-plugin-dependency-debris-cleaned assert_legacy_plugin_dependency_debris_cleaned
phase assert-legacy-runtime-deps-symlink-repaired assert_legacy_runtime_deps_symlink_repaired

6
test/scripts/package-acceptance-workflow.test.ts
View File

@@ -214,6 +214,12 @@ describe("package artifact reuse", () => {
expect(publishedUpgradeSurvivor).toContain("validate_baseline_package_spec");
expect(publishedUpgradeSurvivor).toContain("openclaw@(beta|latest|");
expect(publishedUpgradeSurvivor).toContain("probe_gateway_endpoint");
expect(publishedUpgradeSurvivor).toContain(
"assert_legacy_plugin_dependency_debris_before_doctor",
);
expect(publishedUpgradeSurvivor).toContain(
"Legacy plugin dependency debris was already removed before doctor",
);
expect(
publishedUpgradeSurvivor.indexOf('validate_baseline_package_spec "$baseline_spec"'),
).toBeLessThan(