Merge pull request #18148 from aditirajagopal/16756-docker_api_info_test

Checkers on integration-cli/docker_api_info_test
This commit is contained in:
David Calavera 2015-11-30 11:06:15 -08:00
commit 54733abba3

View file

@ -2,8 +2,8 @@ package main
import (
"net/http"
"strings"
"github.com/docker/docker/pkg/integration/checker"
"github.com/go-check/check"
)
@ -11,8 +11,8 @@ func (s *DockerSuite) TestInfoApi(c *check.C) {
endpoint := "/info"
status, body, err := sockRequest("GET", endpoint, nil)
c.Assert(status, check.Equals, http.StatusOK)
c.Assert(err, check.IsNil)
c.Assert(status, checker.Equals, http.StatusOK)
c.Assert(err, checker.IsNil)
// always shown fields
stringsToCheck := []string{
@ -32,8 +32,6 @@ func (s *DockerSuite) TestInfoApi(c *check.C) {
out := string(body)
for _, linePrefix := range stringsToCheck {
if !strings.Contains(out, linePrefix) {
c.Errorf("couldn't find string %v in output", linePrefix)
}
c.Assert(out, checker.Contains, linePrefix)
}
}