Skip to content

integration/client: add timeout to TestShimOOMScore#8664

Merged
dmcgowan merged 1 commit intocontainerd:mainfrom
laurazard:timeout-integration-test-shim-oomscore
Jun 9, 2023
Merged

integration/client: add timeout to TestShimOOMScore#8664
dmcgowan merged 1 commit intocontainerd:mainfrom
laurazard:timeout-integration-test-shim-oomscore

Conversation

@laurazard
Copy link
Member

@laurazard laurazard commented Jun 9, 2023

I noticed while fixing up #8617 that TestShimOOMScore has no timeout, making it so that if it never receives the task exit event it's expecting, the test hangs for (many) minutes.

@k8s-ci-robot
Copy link

k8s-ci-robot commented Jun 9, 2023

Hi @laurazard. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@laurazard
Copy link
Member Author

laurazard commented Jun 9, 2023

/cc @dmcgowan @fuweid @dcantah @estesp

@dmcgowan dmcgowan merged commit ee2c8b7 into containerd:main Jun 9, 2023
@thaJeztah thaJeztah added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jun 9, 2023
@thaJeztah
Copy link
Member

thaJeztah commented Jun 9, 2023

Added cherry-pick label so that we don't run into this issue in the release branches ☺️

This was referenced Jun 27, 2023
Merged
Merged
@laurazard laurazard added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch and removed cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch labels Jun 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@estesp estesp estesp approved these changes

@dcantah dcantah dcantah approved these changes

@fuweid fuweid Awaiting requested review from fuweid

Assignees

No one assigned

Labels

cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch needs-ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@laurazard @k8s-ci-robot @thaJeztah @dmcgowan @estesp @dcantah