test: refactor container_run_restart_linux_test.go to use Tigron#4916
Open
opjt wants to merge 1 commit into
Open
test: refactor container_run_restart_linux_test.go to use Tigron#4916opjt wants to merge 1 commit into
opjt wants to merge 1 commit into
Conversation
opjt
force-pushed
the
issues_4613_container_run_restart_linux_test.go
branch
2 times, most recently
from
15e1509 to
a358a18
Compare
ChengyuZhu6
reviewed
May 28, 2026
| if err == nil { | ||
| // The daemon is now running, but the daemon may still refuse connections to containerd.sock | ||
| t.Log(fmt.Sprintf("daemon %q is now running, checking whether the daemon can handle requests", target)) | ||
| infoOut, infoErr := exec.Command(testutil.GetTarget(), "info").CombinedOutput() |
Member
There was a problem hiding this comment.
Why not use helpers.Command?
Contributor
Author
There was a problem hiding this comment.
The loop needs to know whether info succeeded without failing the test on intermediate attempts.
As far as I could find, Tigron doesn't offer a way to do both:
Runreturns nothingEnsure/Capturefatal on non-zero exit, andAnyhowdoesn't expose success.
exec.Command was the simplest fit. Open to suggestions if there's a pattern I missed.
Signed-off-by: Park jungtae <jtpark1957@gmail.com>
opjt
force-pushed
the
issues_4613_container_run_restart_linux_test.go
branch
from
a358a18 to
b08f8af
Compare
46 tasks
AkihiroSuda
reviewed
May 30, 2026
| return &test.Requirement{ | ||
| Check: func(data test.Data, helpers test.Helpers) (bool, string) { | ||
| if IsDocker() { | ||
| return true, "" |
Contributor
Author
There was a problem hiding this comment.
Docker target doesn't use containerd plugins, so the check isn't applicable.
Returning true lets the test still run on Docker, matching the original
if !nerdtest.IsDocker() {
testutil.RequireContainerdPlugin(base, "io.containerd.internal.v1", "restart", []string{"unless-stopped"})
}
behavior.
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
3 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.
testutil.NewBaseto usenerdtest.Setup(Tigron) #4613Review point
1.
killDaemon/ensureDaemonActive/dumpDaemonLogslocationThese helpers were previously methods on
testutil.Baseand are used only byTestRunRestartin this file.I've kept them inline (package-private functions) in the test file
if the project expects more daemon-resilience tests in the future, moving them to
pkg/testutil/nerdtest/(e.g., daemon_linux.go) as exported helpers make sense.2.
nerdtest.ContainerdPluginplugin typeThe migrated tests keep
io.containerd.internal.v1to match original behavior. In newer containerd (verified on v2.2.1) this plugin has moved:$ sudo ctr plugins ls | grep restart io.containerd.monitor.container.v1 restart - okAs a result, the 4 tests skip on the v2.x CI jobs but still run on the legacy jobs.
Updating the type (or supporting both) is left as a follow-up.