Partially revert #2723 #2749
Merged
Partially revert #2723 #2749
Conversation
This file contains 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
This reverts most of commit 24c05b7, as otherwise it causes a few regressions (docker cli, TestDockerSwarmSuite/TestServiceLogsTTY). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
As buf is instantiated outside the loop, it is appended to, so if/once an error happens, it contains the output of all previous iterations. Not a big problem but looks a bit untidy. Move the declaration to inside the loop. Fixes: 06a684d Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This test is racy and so far I can't figure out how to fix it. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin
force-pushed
the
revert-2723
branch
from
0218993
to
426aa41
Compare
mrunalp
approved these changes
Jan 19, 2021
AkihiroSuda
approved these changes
Jan 20, 2021
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.
This reverts part of #2723, which caused a regression (#2747), and also disables the TestExecInTTY as it is racy per #2425 and I have no idea yet how to fix it.
Fixes: #2747