Skip to content

test: cancel journal import sampler before database teardown #24767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nwparker merged 2 commits into from
Oct 3, 2026
Merged

test: cancel journal import sampler before database teardown #24767

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f545e14
Cancel the journal import test sampler before database teardown
nwparker Oct 2, 2026
26643ca
Merge current main to retain the corrected E2E dependency contract
nwparker Oct 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/main/native-chat/agent-session-journal/journal-per-session-import.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,25 +236,25 @@ describe('importing a per-chat journal', () => {
await writeLegacyJournal(epoch, rows)
const database = openTestJournalHostDatabase(root)
const turns: { published: boolean; copied: number }[] = []
let ticking = true
const tick = (): void => {
turns.push({
published: readJournalSessionEpoch(database.db, IDENTITY.sessionId) !== null,
copied: rowCount(database.db)
})
if (ticking) {
setImmediate(tick)
}
pending = setImmediate(tick)
}
setImmediate(tick)
let pending = setImmediate(tick)

await importPerSessionJournal({
database,
identity: IDENTITY,
legacyDirectory: legacyDir(),
batchRows: 1
})
ticking = false
try {
await importPerSessionJournal({
database,
identity: IDENTITY,
legacyDirectory: legacyDir(),
batchRows: 1
})
} finally {
clearImmediate(pending)
}

// Other work ran while rows were copied, and none of it could see a partly copied chat.
expect(turns.filter((turn) => !turn.published && turn.copied > 0).length).toBeGreaterThan(0)
Expand Down
Loading