Really run the container in the 04-runtime.bats.#597
Merged
jnovy merged 1 commit intocontainers:mainfrom Sep 15, 2025
Merged
Conversation
Member
Author
Member
Author
|
Nah, I will have to debug why the Build fails in the CI. It's probably missing some dependency, but I will get back to it on Monday. |
7a68409 to
0375b4c
Compare
Member
Author
|
@jnovy , @haircommander , this is ready for a review. I'm still not sure why cri-o tests fail, but I'm quite sure it is not caused by this PR, since it only touches the tests and not any conmon code. |
jnovy
requested changes
Sep 15, 2025
Previously, the conmon has been tested in the 04-runtime.bats, but we never tried to really run the container defined by the conmon. It was therefore not clear whether the conmon configure the runc correctly and whether the logs are really forwarded where they should be. This commit changes it by running the `runc start`. The `sleep` based waiting login is replaced by polling of `runc state` to detect the container `created` and `stopped` states - this makes tests faster and more reliable. The `assert` helper method to compare strings is borrowed from the podman project as it is. The `container cleanup on completion` test is removed, since it does not test anything not tested by the previous tests. Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
0375b4c to
06c0923
Compare
Collaborator
|
Merged, thanks! |
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
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.
Previously, the conmon has been tested in the 04-runtime.bats, but we never tried to really run the container defined by the conmon. It was therefore not clear whether the conmon configure the runc correctly and whether the logs are really forwarded where they should be.
This commit changes it by running the
runc start. Thesleepbased waiting login is replaced by polling ofrunc stateto detect the containercreatedandstoppedstates - this makes tests faster and more reliable.The
asserthelper method to compare strings is borrowed from the podman project as it is.The
container cleanup on completiontest is removed, since it does not test anything not tested by the previous tests.