api/server/router/system: fix info versioning

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 63b5a372037081175ab4ea8f3c7a7bef2195ec0b
Component: engine
This commit is contained in:
Antonio Murdaca
2016-10-21 12:32:23 +02:00
parent de91595c7f
commit 32b1cab2c4
2 changed files with 13 additions and 1 deletions
@@ -38,7 +38,7 @@ func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *ht
info.Swarm = s.clusterProvider.Info()
}
if versions.LessThan("1.25", httputils.VersionFromContext(ctx)) {
if versions.LessThan(httputils.VersionFromContext(ctx), "1.25") {
// TODO: handle this conversion in engine-api
type oldInfo struct {
*types.Info
@@ -38,3 +38,15 @@ func (s *DockerSuite) TestInfoAPI(c *check.C) {
c.Assert(out, checker.Contains, linePrefix)
}
}
func (s *DockerSuite) TestInfoAPIVersioned(c *check.C) {
endpoint := "/v1.20/info"
status, body, err := sockRequest("GET", endpoint, nil)
c.Assert(status, checker.Equals, http.StatusOK)
c.Assert(err, checker.IsNil)
out := string(body)
c.Assert(out, checker.Contains, "ExecutionDriver")
c.Assert(out, checker.Contains, "not supported")
}