Skip to content

tests: fix race condition in TestRunWithSystemdTrueEnabled#4721

Merged
ChengyuZhu6 merged 1 commit intocontainerd:mainfrom
ChengyuZhu6:fix-4708
Jan 30, 2026
Merged

tests: fix race condition in TestRunWithSystemdTrueEnabled#4721
ChengyuZhu6 merged 1 commit intocontainerd:mainfrom
ChengyuZhu6:fix-4708

Conversation

@ChengyuZhu6
Copy link
Member

@ChengyuZhu6 ChengyuZhu6 commented Jan 26, 2026

consolidate subtests into sequential commands to prevent runc exec conflicts.

e.g.:
https://github.com/containerd/nerdctl/actions/runs/21329667209/job/61471351107?pr=4719

Copy link
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, thank you for the fix.

Since TestRunWithSystemdTrueEnabled passes in this PR, let's see if the situation improves.

@AkihiroSuda AkihiroSuda added this to the v2.3.0 milestone Jan 28, 2026

testCase.SubTests = []*test.Case{
{
Description: "should expose SIGTERM+3 stop signal labels",
Copy link
Member

@AkihiroSuda AkihiroSuda Jan 29, 2026

Choose a reason for hiding this comment

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

The description texts should not be removed.
At least it should remain as code comments.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

Expected: test.Expects(expect.ExitCodeSuccess, nil, expect.Contains("SIGRTMIN+3")),
},
{
Description: "waits for systemd to become ready and lists systemd jobs",
Copy link
Member

Choose a reason for hiding this comment

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

Same as above

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

consolidate subtests into sequential commands to
prevent runc exec conflicts.

Signed-off-by: ChengyuZhu6 <hudson@cyzhu.com>
Copy link
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

@ChengyuZhu6 ChengyuZhu6 merged commit 9a18f8f into containerd:main Jan 30, 2026
168 of 180 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants