Enhanced test fixtures for integration tests. - #1834
Merged
Merged
Conversation
jglogan
force-pushed
the
clitest-refactor
branch
3 times, most recently
from
June 26, 2026 02:40
705a335 to
b92d19b
Compare
- Adds `ContainerFixture` with scoped resource lifecycle and cleanup in place of implementation inheritance for test support functions. The fixture also handles resource prefixing and uses a more ergonomic `CommandResult` in place of a tuple for return values. - `ImageWarmup` suite pre-pulls well-known images, and `copyWarmupImage()` tags test-local refs, keeping the canonical image store untouched. - Three-phase `integration-new`: warmup, followed by concurrent tests (managed by the swift test `--experimental-maximum-parallelization-width` flag), followed by serialized tests. - `coverage-new` merges unit + integration-new profraw, replacing `coverage` in CI as a migration progress indicator. - Updates GH workflow so non-coverage invokes both the `integration` and `integration-new` Makefile targets, while coverage runs invoke the `coverage-new` target.
jglogan
force-pushed
the
clitest-refactor
branch
from
June 26, 2026 04:32
b92d19b to
529f6c4
Compare
Code Coverage
|
Comment on lines
+213
to
+215
| echo "Clearing application data under $(APP_ROOT) (preserving kernels)..." ; \ | ||
| mkdir -p $(APP_ROOT) ; \ | ||
| find "$(APP_ROOT)" -mindepth 1 -maxdepth 1 ! -name kernels -exec rm -rf {} + ; \ |
Contributor
There was a problem hiding this comment.
I would prefer we also remove the kernel just so we're guaranteed to have a clean setup.
Contributor
Author
There was a problem hiding this comment.
We could add some sort of preserve-kernel env in a follow-up and make the default the slower setup option.
katiewasnothere
approved these changes
Jun 26, 2026
saehejkang
pushed a commit
to saehejkang/container
that referenced
this pull request
Jul 16, 2026
- Part of apple#1833. - Adds `ContainerFixture` with scoped resource lifecycle and cleanup in place of implementation inheritance for test support functions. The fixture also handles resource prefixing and uses a more ergonomic `CommandResult` in place of a tuple for return values. - `ImageWarmup` suite pre-pulls well-known images, and `copyWarmupImage()` tags test-local refs, keeping the canonical image store untouched. - Three-phase `integration-new`: warmup, followed by concurrent tests (managed by the swift test `--experimental-maximum-parallelization-width` flag), followed by serialized tests. - `coverage-new` merges unit + integration-new profraw, replacing `coverage` in CI as a migration progress indicator. - Updates GH workflow so non-coverage invokes both the `integration` and `integration-new` Makefile targets, while coverage runs invoke the `coverage-new` target.
jianliang00
pushed a commit
to jianliang00/container
that referenced
this pull request
Aug 28, 2026
- Part of apple#1833. - Adds `ContainerFixture` with scoped resource lifecycle and cleanup in place of implementation inheritance for test support functions. The fixture also handles resource prefixing and uses a more ergonomic `CommandResult` in place of a tuple for return values. - `ImageWarmup` suite pre-pulls well-known images, and `copyWarmupImage()` tags test-local refs, keeping the canonical image store untouched. - Three-phase `integration-new`: warmup, followed by concurrent tests (managed by the swift test `--experimental-maximum-parallelization-width` flag), followed by serialized tests. - `coverage-new` merges unit + integration-new profraw, replacing `coverage` in CI as a migration progress indicator. - Updates GH workflow so non-coverage invokes both the `integration` and `integration-new` Makefile targets, while coverage runs invoke the `coverage-new` target.
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
2 participants
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.
ContainerFixturewith scoped resource lifecycle and cleanup in place of implementation inheritance for test support functions. The fixture also handles resource prefixing and uses a more ergonomicCommandResultin place of a tuple for return values.ImageWarmupsuite pre-pulls well-known images, andcopyWarmupImage()tags test-local refs, keeping the canonical image store untouched.integration-new: warmup, followed by concurrent tests (managed by the swift test--experimental-maximum-parallelization-widthflag), followed by serialized tests.coverage-newmerges unit + integration-new profraw, replacingcoveragein CI as a migration progress indicator.integrationandintegration-newMakefile targets, while coverage runs invoke thecoverage-newtarget.Type of Change
Motivation and Context
Recent CI integration test issues and test time increase, especially after adding
container machinetests.Testing