toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26804 from stevvooe/clear-tlsconfig-unix-socket

Browse Source 
client: pedantic checking of tlsconfig
Upstream-commit: 9bd8c1d3321d1b264e84ff5fba4dc04730c264f3
Component: engine
This commit is contained in:
Aaron Lehmann
2016-10-11 15:47:47 -07:00
committed by GitHub
parent fa70234a33 d96c693644
commit 30c8a928f4
6 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/integration-cli/docker_cli_run_test.go
View File

@ -2623,7 +2623,7 @@ func (s *DockerSuite) TestRunModeUTSHost(c *check.C) {
c.Assert(out, checker.Contains, runconfig.ErrConflictUTSHostname.Error())
}
func (s *DockerSuite) TestRunTLSverify(c *check.C) {
func (s *DockerSuite) TestRunTLSVerify(c *check.C) {
// Remote daemons use TLS and this test is not applicable when TLS is required.
testRequires(c, SameHostDaemon)
if out, code, err := dockerCmdWithError("ps"); err != nil || code != 0 {