refactor: migrate container_create_linux_test.go to nerdtest.Setup by ogulcanaydogan · Pull Request #4900 · containerd/nerdctl

ogulcanaydogan · 2026-05-14T14:07:50Z

Summary

Continues the Tigron migration work tracked in #4613. Migrates the remaining testutil.NewBase-based tests in cmd/nerdctl/container/container_create_linux_test.go:

TestCreateWithLabel: migrated; label assertions now use helpers.Capture("inspect", "--format", ...) in the Output callback
TestCreateWithMACAddress: migrated; parent Setup creates networks and fetches the host default MAC, per-subtest Setup generates a unique MAC, Output callbacks run start -a to verify MAC propagation
TestCreateWithTty: migrated; split into two subtests using start -a as the Command, stderr checked via Errors for the no-TTY case
TestCreateFromOCIArchive: migrated; build context created in data.Temp(), OCI archive built and container created in Setup, start --attach returned as the Command
TestUsernsMappingCreateCmd: fixed a pre-existing inconsistency where nerdtest.Setup() was called for its side-effect only and the returned *test.Case discarded; now uses the returned case directly. removeUsernsConfig updated to accept tig.T instead of *testing.T.

TestIssue2993 was already fully migrated and is left unchanged.

Test plan

go build ./cmd/nerdctl/container/ passes (no compile errors)
go test -run ^$ ./cmd/nerdctl/container/ compiles cleanly
CI for the migrated tests on Linux (requires a running containerd environment)

Related: #4613

AkihiroSuda · 2026-05-14T17:37:38Z

TestCreateWithTty seems failing
https://github.com/containerd/nerdctl/actions/runs/25864693531/job/76004326864?pr=4900

ogulcanaydogan · 2026-05-14T22:43:23Z

Thanks for flagging. The issue: with -t, the container's output goes through a pseudoTTY, so capturing it via start -a is unreliable across containerd versions. Fixed by matching the original test's approach: start without -a in Setup, then logs as the Command. The log driver captures tty output consistently regardless of containerd version.

sathiraumesh · 2026-05-15T10:22:15Z

+	}
+	testCase.Expected = func(data test.Data, helpers test.Helpers) *test.Expected {
+		return &test.Expected{
+			ExitCode: 0,


Use constants defined in the tigron framework for the exit codes. Change them in other test cases as well

ogulcanaydogan · 2026-05-15T10:45:14Z

Thanks for the review. Replaced all hardcoded exit code literals in Tigron Expected structs with the named constants from the expect package (ExitCodeSuccess, ExitCodeGenericFail). The existing ExitCodeNoCheck usages were already correct.

haytok · 2026-05-29T04:13:26Z

+				return &test.Expected{
+					ExitCode: expect.ExitCodeSuccess,
+					Output: func(stdout string, t tig.T) {
+						helpers.Ensure("start", "-a", data.Identifier())


The test for the output of nerdctl start -a is missing.

haytok · 2026-05-29T17:05:58Z

+	testCase.Cleanup = func(data test.Data, helpers test.Helpers) {
+		helpers.Anyhow("rm", "-f", data.Identifier())
+		helpers.Anyhow("rmi", "-f", data.Labels().Get("imageName"))
+		helpers.Anyhow("builder", "prune", "--all", "--force")


We shouldn't write builder prune -all --force.

https://github.com/containerd/nerdctl/blob/main/pkg/testutil/nerdtest/requirements.go#L376C2-L383C4

haytok · 2026-05-29T17:12:55Z

-	base.Cmd("start", "--attach", containerName).AssertOutContains("test-nerdctl-create-from-oci-archive")
+	testCase.Setup = func(data test.Data, helpers test.Helpers) {
+		dockerfile := fmt.Sprintf("FROM %s\nCMD [\"echo\", \"%s\"]", testutil.CommonImage, sentinel)
+		err := os.WriteFile(filepath.Join(data.Temp().Path(), "Dockerfile"), []byte(dockerfile), 0644)


Better to use data.Temp().Save(dockerfile, "Dockerfile")

AkihiroSuda · 2026-06-08T06:09:08Z

@ogulcanaydogan Could you check the review comments from haytok ?

Migrate TestCreateWithLabel, TestCreateWithMACAddress, TestCreateWithTty, and TestCreateFromOCIArchive from testutil.NewBase to the Tigron-based nerdtest.Setup pattern. Also fix TestUsernsMappingCreateCmd which called nerdtest.Setup() without using its return value; now uses the returned *test.Case directly. Helper function removeUsernsConfig updated to accept tig.T instead of *testing.T to align with the rest of the Tigron-based test infrastructure. Part of containerd#4613. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

With -t, the container's output goes through a pseudoTTY. Attaching via "start -a" does not reliably forward PTY output through Tigron's subprocess pipe, causing the stty check to fail on certain containerd versions (e.g. v1.7.30). Match the original test's approach: start the container without -a, then read its output via "nerdctl logs" which goes through the log driver and is always available after the container exits. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

Replace hardcoded exit code literals (0, 1) in Tigron test.Expected structs with the named constants from the expect package: ExitCodeSuccess, ExitCodeGenericFail. Existing ExitCodeNoCheck usages were already correct. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

Capture the start -a output and assert the passed MAC is absent for the none-network case, instead of only checking the exit code. Use data.Temp().Save for the Dockerfile instead of os.WriteFile, and drop the manual builder prune --all --force which the Build requirement deliberately omits to keep build tests parallelizable. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

ogulcanaydogan · 2026-06-08T16:55:19Z

@haytok thanks for the review. Addressed all three:

The start -a output is now captured and asserted - the none-network case checks the passed MAC is not present, since network none has no interface to apply it to.
The Dockerfile now uses data.Temp().Save.
Dropped builder prune --all --force from cleanup, matching the Build requirement which leaves it out to keep build tests parallelizable.

Also rebased onto main.

haytok

LGTM

AkihiroSuda

Thanks

ogulcanaydogan mentioned this pull request May 14, 2026

Rewrite tests using testutil.NewBase to use nerdtest.Setup (Tigron) #4613

Open

46 tasks

sathiraumesh suggested changes May 15, 2026

View reviewed changes

haytok self-assigned this May 29, 2026

haytok self-requested a review May 30, 2026 05:16

haytok removed their assignment May 30, 2026

haytok reviewed May 30, 2026

View reviewed changes

AkihiroSuda added this to the v2.3.2 milestone May 30, 2026

AkihiroSuda requested a review from a team June 7, 2026 16:45

ogulcanaydogan added 5 commits June 8, 2026 17:21

refactor: use explicit ExitCode constant in test.Expected struct

a271d8b

Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>

ogulcanaydogan force-pushed the refactor/4613-container-create-linux-tigron branch from 9acaed1 to 819768e Compare June 8, 2026 16:22

haytok approved these changes Jun 9, 2026

View reviewed changes

haytok requested a review from AkihiroSuda June 9, 2026 14:28

AkihiroSuda approved these changes Jun 10, 2026

View reviewed changes

AkihiroSuda merged commit 0899187 into containerd:main Jun 10, 2026
106 of 116 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: migrate container_create_linux_test.go to nerdtest.Setup#4900

refactor: migrate container_create_linux_test.go to nerdtest.Setup#4900
AkihiroSuda merged 5 commits into
containerd:mainfrom
ogulcanaydogan:refactor/4613-container-create-linux-tigron

ogulcanaydogan commented May 14, 2026

Uh oh!

AkihiroSuda commented May 14, 2026

Uh oh!

ogulcanaydogan commented May 14, 2026

Uh oh!

sathiraumesh May 15, 2026

Uh oh!

ogulcanaydogan commented May 15, 2026

Uh oh!

haytok May 29, 2026

Uh oh!

haytok May 29, 2026

Uh oh!

haytok May 29, 2026

Uh oh!

AkihiroSuda commented Jun 8, 2026

Uh oh!

ogulcanaydogan commented Jun 8, 2026

Uh oh!

haytok left a comment

Uh oh!

AkihiroSuda left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

ogulcanaydogan commented May 14, 2026

Summary

Test plan

Uh oh!

AkihiroSuda commented May 14, 2026

Uh oh!

ogulcanaydogan commented May 14, 2026

Uh oh!

sathiraumesh May 15, 2026

Choose a reason for hiding this comment

Uh oh!

ogulcanaydogan commented May 15, 2026

Uh oh!

haytok May 29, 2026

Choose a reason for hiding this comment

Uh oh!

haytok May 29, 2026

Choose a reason for hiding this comment

Uh oh!

haytok May 29, 2026

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda commented Jun 8, 2026

Uh oh!

ogulcanaydogan commented Jun 8, 2026

Uh oh!

haytok left a comment

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants