Fix flaky test #1933
Merged
Fix flaky test #1933
Conversation
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
dnephin
force-pushed
the
fix_scale_test_flakes
branch
from
cfbba2c to
7e630d8
Compare
Fix mutation of service.options when a label or environment variable is specified in the config. Signed-off-by: Daniel Nephin <dnephin@gmail.com>
dnephin
force-pushed
the
fix_scale_test_flakes
branch
from
7e630d8 to
9f3d73f
Compare
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
dnephin
force-pushed
the
fix_scale_test_flakes
branch
from
9f3d73f to
235fe21
Compare
Author
|
It worked! build is green |
Author
There was a problem hiding this comment.
I found it while debugging. It's a no-op since line 193 does the same thing.
|
LGTM |
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.
Branched from #1939
Resolves #1922
This works around the problem of containers not being removed correctly by using a different name for the service. Also adds a new label to all containers so that if we end up with test pollution we can track the container back to the test that created it.
This is definitely just a workaround, but I think the root issue is actually a race condition in the docker engine so will take much longer to fix. I don't like having every branch fail our test suite. So I'd like to push this workaround, since the failure isn't directly related to compose itself.