Skip to content

Move attach command to cobra#23274

Merged
cpuguy83 merged 1 commit intomoby:masterfrom
WeiZhang555:cobra-attach
Jun 7, 2016
Merged

Move attach command to cobra#23274
cpuguy83 merged 1 commit intomoby:masterfrom
WeiZhang555:cobra-attach

Conversation

@WeiZhang555
Copy link
Copy Markdown
Contributor

part of #23211

Signed-off-by: Zhang Wei [email protected]

@vdemeester vdemeester added this to the 1.12.0 milestone Jun 5, 2016
@dnephin dnephin mentioned this pull request Jun 5, 2016
43 tasks
@thaJeztah thaJeztah added the status/failing-ci Indicates that the PR in its current state fails the test suite label Jun 5, 2016
@thaJeztah
Copy link
Copy Markdown
Member

Failing CI looks genuine;

16:38:49 ----------------------------------------------------------------------
16:38:49 FAIL: docker_cli_run_unix_test.go:146: DockerSuite.TestRunAttachDetachFromFlag
16:38:49 
16:38:49 docker_cli_run_unix_test.go:178:
16:38:49     c.Fatalf("expected 'hello', got %q", out)
16:38:49 ... Error: expected 'hello', got "Invalid escape keys ('ctrl-a,a') provided\r\n"
16:38:49 
16:38:50 
16:38:50 ----------------------------------------------------------------------
16:38:50 FAIL: docker_cli_run_unix_test.go:207: DockerSuite.TestRunAttachDetachFromInvalidFlag
16:38:50 
16:38:50 docker_cli_run_unix_test.go:235:
16:38:50     c.Assert(strings.TrimSpace(out), checker.Equals, errStr)
16:38:50 ... obtained string = "Invalid escape keys ('ctrl-A,a') provided"
16:38:50 ... expected string = "Invalid escape keys (ctrl-A,a) provided"
16:38:50 
16:38:51 
16:38:51 ----------------------------------------------------------------------
16:38:51 FAIL: docker_cli_run_unix_test.go:322: DockerSuite.TestRunAttachDetachKeysOverrideConfig
16:38:51 
16:38:51 docker_cli_run_unix_test.go:376:
16:38:51     c.Fatalf("expected 'hello', got %q", out)
16:38:51 ... Error: expected 'hello', got "Invalid escape keys ('ctrl-a,a') provided\r\n"
16:38:51 
16:38:51 
16:38:51 ----------------------------------------------------------------------
16:38:51 PASS: docker_cli_run_test.go:4287: DockerSuite.TestRunAttachFailedNoLeak   0.729s
16:38:52 
16:38:52 ----------------------------------------------------------------------
16:38:52 FAIL: docker_cli_run_unix_test.go:404: DockerSuite.TestRunAttachInvalidDetachKeySequencePreserved
16:38:52 
16:38:52 docker_cli_run_unix_test.go:449:
16:38:52     c.Fatalf("expected 'aba', got %q", out)
16:38:52 ... Error: expected 'aba', got "Invalid escape keys ('a,b,c') provided\r\n"
16:38:52 
16:38:53 

@vdemeester
Copy link
Copy Markdown
Member

ah yes @WeiZhang555 you need to update the integration tests to remove the ' 👼

@WeiZhang555
Copy link
Copy Markdown
Contributor Author

WeiZhang555 commented Jun 6, 2016

@vdemeester You're right, fixed.

Pending win2lin test is actually passed, I guess github notification is missed again.

@thaJeztah thaJeztah removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Jun 6, 2016
@thaJeztah
Copy link
Copy Markdown
Member

ow, looks like this needs a rebase now 😢

@WeiZhang555 WeiZhang555 force-pushed the cobra-attach branch 2 times, most recently from 53d4d4c to fa2a5df Compare June 6, 2016 14:27
@WeiZhang555
Copy link
Copy Markdown
Contributor Author

@thaJeztah Rebased

@thaJeztah
Copy link
Copy Markdown
Member

LGTM

ping @vdemeester @dnephin PTAL

@dnephin
Copy link
Copy Markdown
Member

dnephin commented Jun 6, 2016

LGTM

@cpuguy83 cpuguy83 merged commit ab821f9 into moby:master Jun 7, 2016
@WeiZhang555 WeiZhang555 deleted the cobra-attach branch June 7, 2016 01:39
dnephin pushed a commit to dnephin/docker that referenced this pull request Apr 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants