From ba6f9e4cc9687dd1ccd1ab304b363ed578c6d908 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Mon, 28 Aug 2017 10:19:54 -0700
Subject: [PATCH] integration-cli: fix testutil refactor merge conflict
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
integration-cli/docker_api_build_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go
index 4f4da8cdf2..59b451024e 100644
--- a/integration-cli/docker_api_build_test.go
+++ b/integration-cli/docker_api_build_test.go
@@ -433,7 +433,7 @@ func (s *DockerSuite) TestBuildChownOnCopy(c *check.C) {
c.Assert(err, checker.IsNil)
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
- out, err := testutil.ReadBody(body)
+ out, err := request.ReadBody(body)
require.NoError(c, err)
assert.Contains(c, string(out), "Successfully built")
}