andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

more fixes

Browse source
This commit is contained in:
Andras Schmelczer 2026-04-25 20:42:34 +01:00
parent 8ce33541a3
commit 7a8c497462
6 changed files with 94 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

10
frontend/deterministic-tests/src/test-runner.ts
View file

@ -2,6 +2,7 @@ import type { TestDefinition, TestResult, TestStep } from "./test-definition";
import { DeterministicAgent } from "./deterministic-agent";
import type { ServerControl } from "./server-control";
import type { SyncSettings, Logger } from "sync-client";
import { CONFLICT_PATH_REGEX } from "sync-client";
import { assert } from "./utils/assert";
import { AssertableState } from "./utils/assertable-state";
import { sleep } from "./utils/sleep";
@ -326,6 +327,15 @@ export class TestRunner {
this.logger.info("✓ All clients are consistent");
const conflictFiles = referenceFiles.filter((path) =>
CONFLICT_PATH_REGEX.test(path)
);
if (conflictFiles.length > 0) {
throw new Error(
`Found ${conflictFiles.length} conflict file(s) — local displacements indicate a reconciliation regression: [${conflictFiles.join(", ")}]`
);
}
if (verify) {
this.logger.info("Running custom verification...");
try {