bugfix: can't allow exec attach ttyMode container from a non-tty client #2351
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
Codecov Report
@@ Coverage Diff @@
## master #2351 +/- ##
=========================================
+ Coverage 63.62% 68.03% +4.4%
=========================================
Files 265 265
Lines 18213 18213
=========================================
+ Hits 11588 12391 +803
+ Misses 5342 4401 -941
- Partials 1283 1421 +138
|
fuweid
reviewed
Oct 24, 2018
test/cli_exec_test.go
Outdated
| // TestExecWithTty tests running container with -tty flag and attach stdin in a non-tty client. | ||
| func (suite *PouchExecSuite) TestExecWithTty(c *check.C) { | ||
| name := "TestExecWithTty" | ||
| res := command.PouchRun("run", "-d", "--name", name, busyboxImage, "sleep", "100000") |
There was a problem hiding this comment.
it's just nit. could we use one line to check command.PouchRun("run", "-d", "--name", name, busyboxImage, "sleep", "100000").Assert(c, icmd.Success) ？ thanks.
ZYecho
force-pushed
the
fix-exec-tty
branch
3 times, most recently
from
fdd3d2d to
4783fff
Compare
fuweid
reviewed
Oct 25, 2018
cli/exec.go
Outdated
| @@ -77,6 +77,10 @@ func (e *ExecCommand) runExec(args []string) error { | |||
| Env: e.Envs, | |||
| } | |||
|
|
|||
| if err := checkTty(createExecConfig.AttachStdin, createExecConfig.Tty, os.Stdout.Fd()); err != nil { | |||
There was a problem hiding this comment.
I think it should be os.Stdin.Fd() here.
Signed-off-by: zhangyue <[email protected]>
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.
Signed-off-by: zhangyue [email protected]
Ⅰ. Describe what this PR did
fix the same issue with pr #2338
Ⅱ. Does this pull request fix one issue?
fix the same issue with pr #2338
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
add TestExecWithTty testcase.
Ⅳ. Describe how to verify it
None.
Ⅴ. Special notes for reviews
None.