starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-24 23:41:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again

Browse Source 
Another try at dockerversion placeholder for library import
Upstream-commit: 58b270c338e831ac6668a29788c72d202f9fc251
Component: engine
This commit is contained in:
David Calavera
2015-11-09 13:15:50 -08:00
parent d0affbc9f8 48001c30bb
commit 2f262fa249
23 changed files with 81 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_api_version_test.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"net/http"
"github.com/docker/docker/api/types"
"github.com/docker/docker/autogen/dockerversion"
"github.com/docker/docker/dockerversion"
"github.com/docker/docker/pkg/integration/checker"
"github.com/go-check/check"
)
@@ -19,5 +19,5 @@ func (s *DockerSuite) TestGetVersion(c *check.C) {
c.Assert(json.Unmarshal(body, &v), checker.IsNil)
c.Assert(v.Version, checker.Equals, dockerversion.VERSION, check.Commentf("Version mismatch"))
c.Assert(v.Version, checker.Equals, dockerversion.Version, check.Commentf("Version mismatch"))
}
components/engine/integration-cli/docker_cli_config_test.go
+2 -2
View File
@@ -9,7 +9,7 @@ import (
"path/filepath"
"runtime"
"github.com/docker/docker/autogen/dockerversion"
"github.com/docker/docker/dockerversion"
"github.com/docker/docker/pkg/homedir"
"github.com/docker/docker/pkg/integration/checker"
"github.com/go-check/check"
@@ -54,7 +54,7 @@ func (s *DockerSuite) TestConfigHttpHeader(c *check.C) {
c.Assert(headers["User-Agent"], checker.NotNil, check.Commentf("Missing User-Agent"))
c.Assert(headers["User-Agent"][0], checker.Equals, "Docker-Client/"+dockerversion.VERSION+" ("+runtime.GOOS+")", check.Commentf("Badly formatted User-Agent,out:%v", out))
c.Assert(headers["User-Agent"][0], checker.Equals, "Docker-Client/"+dockerversion.Version+" ("+runtime.GOOS+")", check.Commentf("Badly formatted User-Agent,out:%v", out))
c.Assert(headers["Myheader"], checker.NotNil)
c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("Missing/bad header,out:%v", out))