Files
cleveragents-core/features/steps/transaction_sandbox_coverage_steps.py
Luis Mendes 7f078f75a5
CI / benchmark-publish (pull_request) Has been skipped
CI / lint (pull_request) Successful in 28s
CI / security (pull_request) Successful in 1m8s
CI / build (pull_request) Successful in 20s
CI / helm (pull_request) Successful in 34s
CI / quality (pull_request) Successful in 3m53s
CI / integration_tests (pull_request) Successful in 4m2s
CI / typecheck (pull_request) Successful in 4m9s
CI / unit_tests (pull_request) Successful in 4m48s
CI / docker (pull_request) Successful in 1m19s
CI / e2e_tests (pull_request) Successful in 9m47s
CI / coverage (pull_request) Successful in 11m41s
CI / status-check (pull_request) Successful in 1s
CI / quality (push) Successful in 52s
CI / lint (push) Successful in 3m18s
CI / build (push) Successful in 20s
CI / typecheck (push) Successful in 3m56s
CI / helm (push) Successful in 22s
CI / security (push) Successful in 4m15s
CI / unit_tests (push) Successful in 4m39s
CI / docker (push) Successful in 18s
CI / integration_tests (push) Successful in 6m56s
CI / e2e_tests (push) Successful in 12m34s
CI / coverage (push) Successful in 11m39s
CI / status-check (push) Successful in 1s
CI / benchmark-regression (push) Has been skipped
CI / benchmark-publish (push) Successful in 30m10s
CI / benchmark-regression (pull_request) Successful in 57m33s
fix(sandbox): make commit_all atomic per specification
Changed SandboxManager.commit_all() from partial-commit semantics to
all-or-nothing atomic operation per specification requirement. On
partial failure, already-committed sandboxes are rolled back. Error
reporting indicates which sandbox failed and what was rolled back.
Added Behave scenarios verifying atomicity guarantee.

Hardened atomicity guarantees after code review:

- commit_all and _rollback_committed catch Exception (not just
  SandboxError) so unexpected errors cannot bypass rollback.
  Non-SandboxError exceptions are wrapped in a new AtomicCommitError
  (chaining the original as __cause__) that carries rolled_back_ids
  and failed_rollback_ids attributes so callers can programmatically
  determine rollback outcomes.

- _rollback_committed returns both rolled_back_ids and
  failed_rollback_ids; the error result metadata now carries
  both "rolled_back" and "rollback_failed" keys.

- _rollback_committed iterates in reverse (LIFO) order following
  the standard transaction-log undo pattern.  Clarified in
  docstring that this is distinct from the specification DAG-based
  "top-down" rollback ordering (line 24632).

- TransactionSandbox.rollback() from COMMITTED now raises
  SandboxRollbackError (database commits are irreversible)
  instead of silently transitioning to ROLLED_BACK.

- TransactionSandbox is now classified as non-rollbackable in
  commit_all alongside NoSandbox and committed last in the batch,
  since database COMMIT is irreversible.  Docstring corrected to
  match the raising behavior.

- CopyOnWriteSandbox and OverlaySandbox rollback-from-COMMITTED
  uses rename-based safe_restore() to prevent data loss when
  the copytree step fails after the original was removed.

- CopyOnWriteSandbox and OverlaySandbox rollback() now catches
  Exception (not just OSError), matching the broader catch used
  in _rollback_committed, so non-OSError exceptions from
  safe_restore set the status to ERRORED correctly.

- Extracted shared _fs_utils module (backup_directory,
  safe_restore, compute_diff) with symlink, permission, and
  timestamp preservation (including directory timestamps),
  replacing duplicated per-class _backup_directory and
  _compute_diff methods.

- backup_directory defers directory permissions and timestamps
  to a bottom-up post-walk pass, fixing incorrect mtime
  preservation (POSIX file creation inside a directory overwrites
  its mtime) and preventing restrictive source permissions from
  blocking backup writes.

- backup_directory skips non-regular files (FIFOs, sockets,
  device files) with a warning to prevent hangs on special files.

- CopyOnWriteSandbox and OverlaySandbox commit() now attempts
  to restore the original from the pre-commit backup when the
  file-copy phase fails midway, preventing partial corruption.
  If the restore itself fails the backup is preserved for manual
  recovery (cleanup() still removes it).

- CopyOnWriteSandbox and OverlaySandbox commit() error handler
  now catches Exception (not just OSError) so that unexpected
  errors during the file-copy phase also trigger pre-commit
  backup restoration, preventing partial corruption of the
  original directory.

- Pre-commit backup exception handler catches Exception (not
  just OSError) preventing temp directory leaks on non-OSError
  failures from backup_directory.

- Fixed _pre_commit_backup assignment timing: the backup
  reference is now assigned only AFTER backup_directory()
  succeeds, preventing safe_restore() from corrupting an intact
  original with a partial backup when backup_directory() fails
  (e.g. disk full).

- Rollback from COMMITTED with no pre-commit backup (no changes
  were applied) is now a no-op instead of raising
  SandboxRollbackError, preventing false rollback-failure
  reports in commit_all error metadata.

- commit_all logs a warning when NoSandbox or TransactionSandbox
  instances are present in the batch since their changes cannot
  be rolled back, which breaks the atomicity guarantee.

- Pre-commit backup is skipped when compute_diff returns no
  changes, avoiding a full directory copy for no-op commits.

- GitWorktreeSandbox clears _pre_merge_commit on commit failure
  so the stale value cannot be used by future code.

- commit_all docstring documents Raises clause for AtomicCommitError
  exception wrapping behavior.

- GitWorktreeSandbox.rollback() docstring warns about
  multi-worktree safety when rolling back from COMMITTED.

- Updated SandboxStatus transition diagram in protocol.py to
  clearly show the COMMITTED -> ROLLED_BACK path.

- Added spec-contradiction note (line 45938 vs 19193) in
  commit_all docstring.

- OverlaySandbox rollback from COMMITTED now properly remounts
  OverlayFS for real overlay (unmount, clean upper/work dirs,
  remount) and uses dirs_exist_ok=True for userspace fallback
  to prevent FileExistsError if rmtree silently fails.  The
  merged directory is reset from the restored original,
  preventing stale pre-rollback data from being exposed on
  re-activation via get_path() (which allows ROLLED_BACK status).

- OverlaySandbox rollback from COMMITTED now raises
  SandboxRollbackError if the OverlayFS unmount fails,
  preventing a double-mount attempt that would leave the
  sandbox in an inconsistent state.

- OverlaySandbox rollback from ACTIVE now uses dirs_exist_ok=True
  for userspace fallback to prevent FileExistsError when rmtree
  with ignore_errors=True silently fails.

- CopyOnWriteSandbox rollback from ACTIVE now uses
  dirs_exist_ok=True in copytree to prevent FileExistsError
  when rmtree with ignore_errors=True silently fails, matching
  the fix already applied to OverlaySandbox.

- Non-rollbackable sandboxes (NoSandbox, TransactionSandbox) are
  committed last in the batch so that all rollbackable sandboxes
  commit first; if any rollbackable sandbox fails, none of the
  non-rollbackable sandboxes will have committed yet.

- Moved NoSandbox and TransactionSandbox imports to module level
  in manager.py (no circular dependency exists).

- Pre-commit backups are now created on the same filesystem as
  the original directory (using dir= argument to mkdtemp),
  avoiding cross-device copy overhead and ensuring os.rename
  compatibility.

- safe_restore now renames the target into the mkdtemp directory
  instead of removing the mkdtemp dir first, eliminating the
  residual TOCTOU window between rmdir and rename.

- safe_restore catches BaseException (not just OSError) to
  ensure the original directory is always renamed back on
  unexpected errors, preventing the original from being left
  in the renamed-aside state.

- Added AtomicCommitError exception class to protocol.py
  carrying rolled_back_ids and failed_rollback_ids attributes.

- Exported AtomicCommitError from sandbox package __init__.py
  so callers can import it from the public API.

- Added BDD scenarios: LIFO rollback order, AtomicCommitError
  wrapping with RuntimeError cause and rollback metadata,
  _fs_utils backup/restore coverage, no-change commit rollback
  success, directory timestamp preservation, OverlaySandbox
  merged dir reset after COMMITTED rollback,
  CopyOnWriteSandbox rollback from COMMITTED restores original,
  GitWorktreeSandbox rollback from COMMITTED undoes merge,
  TransactionSandbox rollback from COMMITTED raises
  SandboxRollbackError about irreversible commit.

ISSUES CLOSED: #925

Post-review hardening (PR #1146 review findings):

- OverlaySandbox rollback from COMMITTED with no backup (no-op)
  now skips the merged directory reset entirely, preventing
  unnecessary unmount/remount or re-copy that could fail and
  turn a harmless no-op rollback into a SandboxRollbackError
  during commit_all atomic recovery.

- OverlaySandbox rollback no longer double-wraps
  SandboxRollbackError: the outer except Exception handler
  now has a preceding except SandboxRollbackError clause that
  re-raises directly, avoiding a confusing double-wrapped
  error chain.

- CopyOnWriteSandbox.get_path() now accepts ROLLED_BACK status
  for consistency with OverlaySandbox and the protocol status
  transition table (ROLLED_BACK -> ACTIVE).

- CopyOnWriteSandbox rollback from COMMITTED now resets the
  sandbox copy from the restored original via rmtree+copytree,
  preventing stale pre-rollback modifications from being
  exposed on re-activation.

- rollback_all now catches Exception (not just SandboxError)
  so that unexpected rollback errors do not prevent remaining
  sandboxes from being rolled back, consistent with the pattern
  already used in _rollback_committed.

- commit_all docstring now documents a thread-safety warning:
  the method is not safe for concurrent calls on the same
  plan_id since sandbox commit/rollback runs outside the lock.

- Fixed CHANGELOG.md whitespace inconsistencies (double leading
  spaces on two lines).

Post-review hardening round 2 (PR #1146 automated review):

- safe_restore now uses os.rename (O(1) atomic rename) instead
  of shutil.copytree (O(n) recursive copy) for the main restore
  path, since backup and target are always on the same
  filesystem.  This eliminates the ENOTEMPTY bug where a partial
  copytree failure left target_path partially populated, causing
  the recovery os.rename to fail and strand the original in the
  stale temp directory.

- OverlaySandbox.get_path() now transitions ROLLED_BACK to
  ACTIVE, matching CopyOnWriteSandbox and the protocol
  transition table (ROLLED_BACK -> ACTIVE).

- GitWorktreeSandbox.get_path() now accepts ROLLED_BACK status
  for consistency with all other sandbox implementations and
  the protocol transition table (ROLLED_BACK -> ACTIVE).

- rollback_all now also handles sandboxes in COMMITTED status
  (not just ACTIVE), consistent with the state machine allowing
  COMMITTED -> ROLLED_BACK.

- cleanup_all now catches Exception (not just SandboxError) so
  a single unexpected error does not abort cleanup of remaining
  sandboxes, consistent with _rollback_committed and
  rollback_all.

- Restructured CHANGELOG entry from a single ~90-line paragraph
  into structured sub-bullets for readability.

- Added BDD scenarios: no-op rollback from COMMITTED for
  CopyOnWriteSandbox and OverlaySandbox (zero-change commit),
  commit ordering verification (rollbackable before
  non-rollbackable).

Post-review hardening round 3 (PR #1146 deep automated review):

- cleanup_abandoned now catches Exception (not just SandboxError)
  so that unexpected errors (e.g. raw OSError, PermissionError)
  do not crash the loop and prevent remaining abandoned sandboxes
  from being cleaned up, consistent with cleanup_all,
  rollback_all, and _rollback_committed.

- OverlaySandbox._mount_overlay() now catches
  subprocess.TimeoutExpired (in addition to CalledProcessError
  and OSError), preventing create() from leaving the sandbox in
  PENDING status when mount hangs beyond the timeout.

- OverlaySandbox._unmount_overlay() now catches
  subprocess.TimeoutExpired (in addition to CalledProcessError
  and OSError), preventing cleanup() from leaving the sandbox
  in a zombie state when umount hangs beyond the timeout.

- OverlaySandbox._mount_overlay() validates that overlay paths
  do not contain commas, which would corrupt the OverlayFS mount
  options string (comma is the mount option delimiter).

- GitWorktreeSandbox.commit() now checks git diff return code
  so that a failed diff command raises CalledProcessError instead
  of silently concluding there are no changes and skipping the
  merge.

- safe_restore cleanup of the temporary rollback container now
  runs in a finally block, preventing a temp directory leak
  when the rename fails and the exception is re-raised.

- Fixed misleading BDD step name: "backup path that will cause
  copytree to fail" renamed to "backup path that will cause
  rename to fail" since safe_restore now uses os.rename.
2026-03-29 18:57:15 +01:00

275 lines
10 KiB
Python

"""Step definitions for transaction_sandbox_coverage.feature.
These steps target specific uncovered lines in transaction_sandbox.py:
- Line 102: sandbox_id property getter
- Line 112: context property getter
- Lines 147-151: sqlite3.Error handler in create()
- Lines 237-241: sqlite3.Error handler in commit()
- Lines 282-286: sqlite3.Error handler in rollback()
- Line 366: SandboxStateError when connection is None in execute()
"""
import sqlite3
from unittest.mock import MagicMock, patch
from behave import given, then, when
from cleveragents.infrastructure.sandbox.protocol import (
SandboxCommitError,
SandboxCreationError,
SandboxRollbackError,
SandboxStateError,
SandboxStatus,
)
from cleveragents.infrastructure.sandbox.transaction_sandbox import TransactionSandbox
# ---------------------------------------------------------------------------
# Background
# ---------------------------------------------------------------------------
@given("the transaction sandbox module is imported")
def step_module_imported(context):
"""Ensure the module is importable."""
assert TransactionSandbox is not None
# ---------------------------------------------------------------------------
# Scenario: sandbox_id property (line 102)
# ---------------------------------------------------------------------------
@given('I have a fresh TransactionSandbox for resource "{res}" and path "{path}"')
def step_create_fresh_sandbox(context, res, path):
"""Instantiate a TransactionSandbox without calling create()."""
context.sandbox = TransactionSandbox(resource_id=res, original_path=path)
@when("I access the sandbox_id property")
def step_access_sandbox_id(context):
"""Read the sandbox_id property to hit line 102."""
context.sandbox_id_value = context.sandbox.sandbox_id
@then("the sandbox_id should be a non-empty string")
def step_verify_sandbox_id(context):
"""Verify sandbox_id is a non-empty ULID string."""
assert isinstance(context.sandbox_id_value, str)
assert len(context.sandbox_id_value) > 0
# ---------------------------------------------------------------------------
# Scenario: context property (line 112)
# ---------------------------------------------------------------------------
@when("I access the context property before calling create")
def step_access_context_before_create(context):
"""Read the context property before create() to hit line 112."""
context.context_before = context.sandbox.context
@then("the context should be None")
def step_verify_context_none(context):
"""Verify context is None before create."""
assert context.context_before is None
@when('tscov I create the sandbox with plan "{plan_id}"')
def step_create_sandbox(context, plan_id):
"""Call create() on the sandbox."""
context.sandbox_context = context.sandbox.create(plan_id)
@when("I access the context property after calling create")
def step_access_context_after_create(context):
"""Read the context property after create() to hit line 112 again."""
context.context_after = context.sandbox.context
@then('the context should contain plan id "{plan_id}"')
def step_verify_context_plan_id(context, plan_id):
"""Verify context has the expected plan_id."""
assert context.context_after is not None
assert context.context_after.plan_id == plan_id
# ---------------------------------------------------------------------------
# Scenario: SandboxCreationError (lines 147-151)
# ---------------------------------------------------------------------------
@given("I have a TransactionSandbox whose connection will fail during create")
def step_sandbox_with_failing_connect(context):
"""Create a sandbox and arrange for sqlite3.connect to fail."""
context.sandbox = TransactionSandbox(
resource_id="res-fail", original_path=":memory:"
)
@when('I attempt to create the failing sandbox with plan "{plan_id}"')
def step_attempt_create_failing(context, plan_id):
"""Call create() with a mocked sqlite3.connect that raises sqlite3.Error."""
context.caught_error = None
with patch(
"cleveragents.infrastructure.sandbox.transaction_sandbox.sqlite3.connect",
side_effect=sqlite3.OperationalError("disk I/O error"),
):
try:
context.sandbox.create(plan_id)
except SandboxCreationError as exc:
context.caught_error = exc
@then("a SandboxCreationError should be raised")
def step_verify_creation_error(context):
"""Verify a SandboxCreationError was caught."""
assert context.caught_error is not None
assert isinstance(context.caught_error, SandboxCreationError)
@then("the sandbox status should be errored")
def step_verify_errored(context):
"""Verify the sandbox transitioned to ERRORED status."""
assert context.sandbox.status == SandboxStatus.ERRORED
# ---------------------------------------------------------------------------
# Scenario: SandboxCommitError (lines 237-241)
# ---------------------------------------------------------------------------
@given("I have an active TransactionSandbox with a connection that fails on COMMIT")
def step_sandbox_commit_fail(context):
"""Create, activate a sandbox, then replace connection to fail on COMMIT."""
sb = TransactionSandbox(resource_id="res-commit-fail", original_path=":memory:")
sb.create("plan-commit-fail")
# Execute something to move to ACTIVE status
sb.execute("SELECT 1")
# Replace the connection with a mock that raises on COMMIT
mock_conn = MagicMock()
mock_conn.execute = MagicMock(side_effect=sqlite3.OperationalError("journal error"))
sb._connection = mock_conn
context.sandbox = sb
@when("I attempt to commit the sandbox")
def step_attempt_commit(context):
"""Call commit() and expect an error."""
context.caught_error = None
try:
context.sandbox.commit("test commit")
except SandboxCommitError as exc:
context.caught_error = exc
@then("a SandboxCommitError should be raised")
def step_verify_commit_error(context):
"""Verify a SandboxCommitError was caught."""
assert context.caught_error is not None
assert isinstance(context.caught_error, SandboxCommitError)
# ---------------------------------------------------------------------------
# Scenario: SandboxRollbackError (lines 282-286)
# ---------------------------------------------------------------------------
@given("I have an active TransactionSandbox with a connection that fails on ROLLBACK")
def step_sandbox_rollback_fail(context):
"""Create, activate a sandbox, then replace connection to fail on ROLLBACK."""
sb = TransactionSandbox(resource_id="res-rollback-fail", original_path=":memory:")
sb.create("plan-rollback-fail")
# Execute something to move to ACTIVE status
sb.execute("SELECT 1")
# Replace the connection with a mock that raises on ROLLBACK
mock_conn = MagicMock()
mock_conn.execute = MagicMock(
side_effect=sqlite3.OperationalError("database is locked")
)
sb._connection = mock_conn
context.sandbox = sb
@when("I attempt to rollback the sandbox")
def step_attempt_rollback(context):
"""Call rollback() and expect an error."""
context.caught_error = None
try:
context.sandbox.rollback()
except SandboxRollbackError as exc:
context.caught_error = exc
@then("a SandboxRollbackError should be raised")
def step_verify_rollback_error(context):
"""Verify a SandboxRollbackError was caught."""
assert context.caught_error is not None
assert isinstance(context.caught_error, SandboxRollbackError)
# ---------------------------------------------------------------------------
# Scenario: Rollback from COMMITTED raises SandboxRollbackError
# ---------------------------------------------------------------------------
@when('tscov I execute SQL "SELECT 1" to activate the sandbox')
def step_tscov_execute_to_activate(context):
"""Execute a SQL statement to transition the sandbox to ACTIVE."""
context.sandbox.execute("SELECT 1")
@when("tscov I commit the sandbox")
def step_tscov_commit(context):
"""Commit the sandbox."""
context.sandbox.commit("test commit")
@then('tscov the sandbox status should be "{status}"')
def step_tscov_verify_status(context, status):
"""Verify the sandbox status."""
expected = SandboxStatus(status)
assert context.sandbox.status == expected, (
f"Expected status {expected}, got {context.sandbox.status}"
)
@when("tscov I attempt to rollback the committed sandbox")
def step_tscov_attempt_rollback_committed(context):
"""Call rollback() on a COMMITTED sandbox and expect SandboxRollbackError."""
context.caught_error = None
try:
context.sandbox.rollback()
except SandboxRollbackError as exc:
context.caught_error = exc
@then("a SandboxRollbackError should be raised about irreversible commit")
def step_tscov_verify_irreversible_rollback(context):
"""Verify a SandboxRollbackError about irreversible COMMIT was raised."""
assert context.caught_error is not None
assert isinstance(context.caught_error, SandboxRollbackError)
assert "cannot undo database commit" in str(context.caught_error).lower(), (
f"Expected message about irreversible commit, got: {context.caught_error}"
)
# ---------------------------------------------------------------------------
# Scenario: execute with None connection (line 366)
# ---------------------------------------------------------------------------
@given("I have a TransactionSandbox in active state with no database connection")
def step_sandbox_no_connection(context):
"""Create and activate a sandbox, then remove its connection."""
sb = TransactionSandbox(resource_id="res-no-conn", original_path=":memory:")
sb.create("plan-no-conn")
# Force connection to None while keeping CREATED status (valid for execute)
sb._connection = None
context.sandbox = sb
@when('I attempt to execute SQL "{sql}" on the sandbox')
def step_attempt_execute(context, sql):
"""Call execute() and expect a SandboxStateError."""
context.caught_error = None
try:
context.sandbox.execute(sql)
except SandboxStateError as exc:
context.caught_error = exc
@then("a SandboxStateError about missing connection should be raised")
def step_verify_no_connection_error(context):
"""Verify a SandboxStateError about missing connection was raised."""
assert context.caught_error is not None
assert isinstance(context.caught_error, SandboxStateError)
assert "connection not available" in str(context.caught_error).lower()