diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2016-12-30 18:23:00 +0100 |
|---|---|---|
| committer | Vincent Demeester <vincent@sbr.pm> | 2016-12-30 18:26:34 +0100 |
| commit | 33968e6c7df164fff0a882c50ae7f4f7e6190e4b (patch) | |
| tree | 582c9ef712a844a31465b695bc0d1ae8872909b0 /integration-cli/docker_api_build_test.go | |
| parent | 5374d53322abd6a5b2ebb34b7422abc26d1b5eb3 (diff) | |
| download | docker-33968e6c7df164fff0a882c50ae7f4f7e6190e4b.tar.gz | |
Remove pkg/integration and move it to testutil or integration-cli
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'integration-cli/docker_api_build_test.go')
| -rw-r--r-- | integration-cli/docker_api_build_test.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index 0cc97a95d7..3ff9d18818 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" "github.com/go-check/check" ) @@ -35,7 +35,7 @@ RUN find /tmp/` c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusOK) - buf, err := integration.ReadBody(body) + buf, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) // Make sure Dockerfile exists. @@ -126,7 +126,7 @@ RUN echo 'right' c.Assert(res.StatusCode, checker.Equals, http.StatusOK) defer body.Close() - content, err := integration.ReadBody(body) + content, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) // Build used the wrong dockerfile. @@ -145,7 +145,7 @@ RUN echo from dockerfile`, c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusOK) - buf, err := integration.ReadBody(body) + buf, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) out := string(buf) @@ -167,7 +167,7 @@ RUN echo from Dockerfile`, c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusOK) - buf, err := integration.ReadBody(body) + buf, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) out := string(buf) @@ -190,7 +190,7 @@ RUN echo from dockerfile`, c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusOK) - buf, err := integration.ReadBody(body) + buf, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) out := string(buf) @@ -237,7 +237,7 @@ func (s *DockerSuite) TestBuildAPIUnnormalizedTarPaths(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusOK) - out, err := integration.ReadBody(body) + out, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) lines := strings.Split(string(out), "\n") c.Assert(len(lines), checker.GreaterThan, 1) |