Skip to content

test(faseF1): end-to-end push/pull/clone/conflict integration test - #20

Merged
SammyBytes merged 1 commit into
mainfrom
feat/faseF1-e2e-roundtrip
Aug 29, 2026
Merged

test(faseF1): end-to-end push/pull/clone/conflict integration test#20
SammyBytes merged 1 commit into
mainfrom
feat/faseF1-e2e-roundtrip

Conversation

@SammyBytes

Copy link
Copy Markdown
Owner

Summary

CI-gated end-to-end test (real server subprocess + real dolt) exercising the full sync layer over HTTP — the piece unit tests don't cover.

Covers

  1. A creates a table + commits + push (push-commits).
  2. B clone (full pull-commits) → verifies data and primary key (schema came as DDL).
  3. B pushes a row; A pull fast-forwards and sees it.
  4. Divergent edits → A pull → merge conflict surfaced → merge --abort restores clean tree.

Note

Cannot run in this local env (the server subprocess fails licensing boot locally — same as the existing versioning.integration.test.ts); it runs in CI where the other integration tests already pass. Mirrors that harness.

Real-server + real-dolt round trip (CI-gated, like the other integration
tests): A creates+pushes, B clones and verifies data + PK, B pushes and A
fast-forwards, then a divergent edit surfaces a merge conflict and aborts
clean. Exercises the HTTP layer end to end: push-commits, refs, pull-commits
NDJSON + X-Deltix-Server-Head header, and the local apply/merge mechanics.
@SammyBytes
SammyBytes merged commit 3f565b4 into main Aug 29, 2026
2 checks passed
@SammyBytes
SammyBytes deleted the feat/faseF1-e2e-roundtrip branch August 29, 2026 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant