libcontainer/integration: fix unit test#2661
Merged
AkihiroSuda merged 1 commit intoOct 26, 2020
Merged
Conversation
Fix a merge issue between 0aa0fae ("Kill all processes in cgroup even if init process Wait fails") & 73d93ee ("libct/int: make newTemplateConfig argument a struct") that resulted in passing the wrong datatype to newTemplateConfig in TestPIDHostInitProcessWait. Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io>
mauriciovasquezbernal
force-pushed
the
mauricio/fix-unit-test-in-libcontainer-exec
branch
from
9d009b7 to
ac5ec5e
Compare
mrunalp
approved these changes
Oct 23, 2020
AkihiroSuda
approved these changes
Oct 26, 2020
mauriciovasquezbernal
deleted the
mauricio/fix-unit-test-in-libcontainer-exec
branch
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
3 participants
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.
73d93ee (part of #2600) missed one update in 'TestPIDHostInitProcessWait' and now the unit tests are broken.Edit: It was a merge issue between #2633 (Introduced 'TestPIDHostInitProcessWait') & #2600 (was opened before 'TestPIDHostInitProcessWait' was present). No idea why the CI didn't catch this problem.
I found it while having a weird linter failure not related to my changes in #2660.
ref https://travis-ci.org/github/opencontainers/runc/jobs/738208029#L345
cc @mrunalp @kolyshkin