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

fix tests after CLI update

Browse Source 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 73e2f55543346b285585f350e53f82ae419f8849
Component: engine
This commit is contained in:
Brian Goff
2017-05-10 20:09:50 -04:00
parent fd866433a8
commit 3bffce1905
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_config_test.go
+1 -1
View File
@@ -59,7 +59,7 @@ func (s *DockerSuite) TestConfigHTTPHeader(c *check.C) {
c.Assert(headers["User-Agent"], checker.NotNil, check.Commentf("Missing User-Agent"))
//TODO(tiborvass): restore dockerversion.Version instead of library-import
c.Assert(headers["User-Agent"][0], checker.Equals, "Docker-Client/library-import ("+runtime.GOOS+")", check.Commentf("Badly formatted User-Agent,out:%v", result.Combined()))
c.Assert(headers["User-Agent"][0], checker.Equals, "Docker-Client/unknown-version ("+runtime.GOOS+")", check.Commentf("Badly formatted User-Agent,out:%v", result.Combined()))
c.Assert(headers["Myheader"], checker.NotNil)
c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("Missing/bad header,out:%v", result.Combined()))
components/engine/integration-cli/docker_cli_exec_test.go
+1 -1
View File
@@ -143,7 +143,7 @@ func (s *DockerSuite) TestExecPausedContainer(c *check.C) {
ContainerID := strings.TrimSpace(out)
dockerCmd(c, "pause", "testing")
out, _, err := dockerCmdWithError("exec", "-i", "-t", ContainerID, "echo", "hello")
out, _, err := dockerCmdWithError("exec", ContainerID, "echo", "hello")
c.Assert(err, checker.NotNil, check.Commentf("container should fail to exec new command if it is paused"))
expected := ContainerID + " is paused, unpause the container before exec"