Repository navigation
Commit 4061125
committed
fix: restore unconfirmed-ownership handling for a busy cohort; align conflict-hint tests
Jenkins release-tooling DeusData#64 on 928191b failed 4 tests, both groups caused
by the PR #18 minor-comment fixes.
1. Revert the CBM_VERSION_COHORT_BUSY change in
cli_activation_resolve_scope. 928191b followed a CodeRabbit suggestion
to treat BUSY as ACTIVE and take the coordinated reservation path. That
contradicts the recorded user decision of 2026-09-28, "unknown =
foreign, keep it", which tests (e) and (f) in tests/test_cli.c pin.
cli_install_foreign_home_busy_cohort_keeps_host_daemon (test_cli.c:2238)
checks the busy case: when another activation holds the cohort
maintenance gate, the cohort's cache identity cannot be read, so
ownership is unconfirmed. Install must then leave the host daemon
serving, drain no one, mutate only this home and cache, and print the
notice naming that daemon and how to stop it. With the change, install
refused with "something is still using CBM". BUSY is routed back
through cli_activation_scope_unconfirmed, with a comment citing the
decision.
2. tests/test_daemon_version.c (309, 327, 346): the daemon conflict remedy
in runtime.c names the fork binary (codebase-memory-cli) since
928191b. The three remedy tests now assert `which -a
codebase-memory-cli`, `codebase-memory-cli daemon stop` and
`codebase-memory-cli daemon status`.
Validated: -Werror build and test-runner, lint --ci, and the cli and
daemon_version suites.1 parent 928191b commit 4061125
2 files changed
Lines changed: 11 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
629 | 629 | | |
630 | 630 | | |
631 | 631 | | |
632 | | - | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
633 | 637 | | |
634 | 638 | | |
635 | 639 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
306 | 306 | | |
307 | 307 | | |
308 | 308 | | |
309 | | - | |
310 | | - | |
| 309 | + | |
| 310 | + | |
311 | 311 | | |
312 | 312 | | |
313 | 313 | | |
| |||
324 | 324 | | |
325 | 325 | | |
326 | 326 | | |
327 | | - | |
| 327 | + | |
328 | 328 | | |
329 | 329 | | |
330 | 330 | | |
| |||
343 | 343 | | |
344 | 344 | | |
345 | 345 | | |
346 | | - | |
347 | | - | |
348 | | - | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
349 | 349 | | |
350 | 350 | | |
351 | 351 | | |
| |||
0 commit comments