Skip to content

Refactor compose_run_linux_test#4845

Merged
AkihiroSuda merged 1 commit into
containerd:mainfrom
sathiraumesh:refactor_compose_run_linux_test_4613
Jun 1, 2026
Merged

Refactor compose_run_linux_test#4845
AkihiroSuda merged 1 commit into
containerd:mainfrom
sathiraumesh:refactor_compose_run_linux_test_4613

Conversation

@sathiraumesh
Copy link
Copy Markdown
Contributor

@sathiraumesh sathiraumesh commented Apr 11, 2026 •
edited
Loading

Summary

  • Migrated 7 out of 10 tests in compose_run_linux_test.go from legacy testutil.NewBase to nerdtest.Setup() / tigron framework

Not included

  • TestComposePushAndPullWithCosignVerify remains on legacy harness — blocked on testregistry requiring *testutil.Base, A seperate PR would be better of this
  • TestComposeRunWithServicePorts remains legacy due to the flakyness
  • TestComposeRunWithPublish remains legacy due to the flakynesss

@sathiraumesh sathiraumesh marked this pull request as draft April 11, 2026 11:54
@AkihiroSuda AkihiroSuda mentioned this pull request Apr 12, 2026
Open
46 tasks
@sathiraumesh sathiraumesh marked this pull request as ready for review April 18, 2026 07:48
@sathiraumesh sathiraumesh force-pushed the refactor_compose_run_linux_test_4613 branch 2 times, most recently from 1c62fbd to 83f48b8 Compare April 18, 2026 07:55
@sathiraumesh
Copy link
Copy Markdown
Contributor Author

sathiraumesh commented Apr 18, 2026

@AkihiroSuda this is up for review

@haytok
Copy link
Copy Markdown
Member

haytok commented Apr 19, 2026 •
edited
Loading

HI, @sathiraumesh

Thanks for creating this PR.

It looks like the test you refactored is failing. Could you please check it?

https://github.com/containerd/nerdctl/actions/runs/24600266536/job/71937779334?pr=4845

=== Failing tests ===
TestComposeRunWithServicePorts

https://github.com/containerd/nerdctl/actions/runs/24600266519/job/71937648351?pr=4845

TestComposeRunWithEnv

@sathiraumesh
Copy link
Copy Markdown
Contributor Author

sathiraumesh commented Apr 19, 2026

sure @haytok ill have a look

@AkihiroSuda AkihiroSuda marked this pull request as draft May 14, 2026 17:41
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented May 14, 2026

Marking as a draft due to the CI failure.
Please click "Ready for review" when it is ready.

@sathiraumesh sathiraumesh force-pushed the refactor_compose_run_linux_test_4613 branch 3 times, most recently from 7aa3be4 to 326f008 Compare May 22, 2026 08:37
@sathiraumesh sathiraumesh marked this pull request as ready for review May 22, 2026 09:10
@sathiraumesh
Copy link
Copy Markdown
Contributor Author

sathiraumesh commented May 22, 2026

@AkihiroSuda its ready for review. I only migrated the non flaky tests.

@sathiraumesh
Copy link
Copy Markdown
Contributor Author

sathiraumesh commented May 29, 2026

@AkihiroSuda a kind reminder to review this

@AkihiroSuda AkihiroSuda added this to the v2.3.2 milestone May 29, 2026
@AkihiroSuda AkihiroSuda requested a review from a team May 29, 2026 08:42
@haytok haytok assigned haytok and unassigned haytok May 30, 2026
@haytok haytok self-requested a review May 30, 2026 05:16
haytok
haytok reviewed May 30, 2026
View reviewed changes
Comment thread cmd/nerdctl/compose/compose_run_linux_test.go
@sathiraumesh
test: migrate stable compose run tests to nerdtest framework
80cf9f8 
Migrates the non-flaky compose run tests to nerdtest.Setup():
- TestComposeRunWithEnv
- TestComposeRunWithUser
- TestComposeRunWithArgs
- TestComposeRunWithEntrypoint
- TestComposeRunWithLabel (uses nerdtest.InspectContainer)
- TestComposeRunWithVolume (uses nerdtest.InspectContainer)

Replaces the unbuffer(1) pty wrapper with cmd.WithPseudoTTY(), and
uses expect.ExitCodeSuccess instead of literal 0 for exit codes.

TestComposeRunWithServicePorts, TestComposeRunWithPublish, and
TestComposePushAndPullWithCosignVerify are intentionally left on the
legacy framework for now (flaky / complex).

Signed-off-by: sathiraumesh <sathiraumesh@gmail.com>
@sathiraumesh sathiraumesh force-pushed the refactor_compose_run_linux_test_4613 branch from 326f008 to 80cf9f8 Compare May 30, 2026 18:34
haytok
haytok approved these changes May 31, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@haytok haytok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, Thanks!

@haytok haytok requested a review from AkihiroSuda May 31, 2026 07:43
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented May 31, 2026 

=== Failing tests ===
TestComposeImages
TestComposeKill
TestComposePs
TestComposePullWithService
TestComposeRemove
TestComposeRestart
TestIPFSAddrWithKubo
=====================

https://github.com/containerd/nerdctl/actions/runs/26691700182/job/78710174989?pr=4845

@sathiraumesh
Copy link
Copy Markdown
Contributor Author

sathiraumesh commented May 31, 2026

@AkihiroSuda

=== Failing tests ===
TestComposeImages
TestComposeKill
TestComposePs
TestComposePullWithService
TestComposeRemove
TestComposeRestart
TestIPFSAddrWithKubo
=====================

https://github.com/containerd/nerdctl/actions/runs/26691700182/job/78710174989?pr=4845

I don't think its because of the changes from this PR.

AkihiroSuda
AkihiroSuda approved these changes Jun 1, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@AkihiroSuda AkihiroSuda merged commit cda10d6 into containerd:main Jun 1, 2026
111 of 120 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

+1 more reviewer

@haytok haytok haytok approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v2.3.2

Development

Successfully merging this pull request may close these issues.

3 participants

@sathiraumesh @haytok @AkihiroSuda