Fix flaky WriteWithoutClose/CreateFileWithoutClose functional tests#1959
Merged
tyrielv merged 1 commit intoMay 6, 2026
Merged
Conversation
The StatusTests WriteWithoutClose and CreateFileWithoutClose tests intentionally open file handles without closing them, then validate git status behavior. The handles were created as local variables inside OpenFileAndWriteWithoutClose/CreateFileWithoutClose with no reference kept — making them eligible for GC immediately. If the GC collected the handles before TearDown ran git reset --hard, the reset would succeed (no lock errors) while the control repo might still have errors, causing a flaky mismatch. Fix: return IDisposable from the file-handle-leaking methods, hold them in using blocks in the test methods. Handles stay alive for the assertion scope and are deterministically disposed before TearDown runs, eliminating the GC race. Also add StreamWriter.Flush() to ensure written data is on disk before returning. Assisted-by: Claude Opus 4.6 Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fix GC-dependent race condition causing flaky failures in
StatusTests.WriteWithoutClose()andStatusTests.CreateFileWithoutClose().Problem
These tests intentionally open file handles without closing them to validate that
git statusworks with locked files. The handles were created as local variables insideOpenFileAndWriteWithoutClose/CreateFileWithoutClosewith no reference kept — making them eligible for GC immediately. If the GC finalized the handles before TearDown rangit reset --hard, the reset would succeed (no lock errors) while the control repo might still have errors, causing a flaky error mismatch in TearDown.Fix
FileSystemRunner.CreateFileWithoutCloseandOpenFileAndWriteWithoutCloseto returnIDisposableinstead ofvoidSystemIORunnerreturns the actualFileStream/StreamWriterhandle, with an explicitFlush()to ensure data is on diskGitRepoTestshelpers return aCompositeDisposablewrapping handles for both GVFS and control reposStatusTestsusesusingblocks — handles stay alive during the assertion scope and are deterministically disposed before TearDown runsThis eliminates the GC race: both repos have unlocked files when
reset --hardruns in TearDown, so errors match (both 0).Testing