summaryrefslogtreecommitdiff
path: root/integration-cli/docker_deprecated_api_v124_unix_test.go
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2019-04-04 15:23:19 +0200
committerSebastiaan van Stijn <github@gone.nl>2019-04-05 16:45:37 +0200
commit6345208b9b067f19f7792edcc675f59a617a3ca5 (patch)
tree6bc6b87e4d3a70732400d1a38914a554e3f785ae /integration-cli/docker_deprecated_api_v124_unix_test.go
parent86f2ac4a6b5b746c3309b57e7e04bdbdb70d46d7 (diff)
downloaddocker-6345208b9b067f19f7792edcc675f59a617a3ca5.tar.gz
Replace some checkers and assertions with gotest.tools
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'integration-cli/docker_deprecated_api_v124_unix_test.go')
-rw-r--r--integration-cli/docker_deprecated_api_v124_unix_test.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/integration-cli/docker_deprecated_api_v124_unix_test.go b/integration-cli/docker_deprecated_api_v124_unix_test.go
index c182b2a7aa..0aae30be80 100644
--- a/integration-cli/docker_deprecated_api_v124_unix_test.go
+++ b/integration-cli/docker_deprecated_api_v124_unix_test.go
@@ -3,11 +3,11 @@
package main
import (
- "fmt"
+ "strings"
- "github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/internal/test/request"
"github.com/go-check/check"
+ "gotest.tools/assert"
)
// #19100 This is a deprecated feature test, it should be removed in Docker 1.12
@@ -23,9 +23,9 @@ func (s *DockerNetworkSuite) TestDeprecatedDockerNetworkStartAPIWithHostconfig(c
},
}
_, _, err := request.Post(formatV123StartAPIURL("/containers/"+conName+"/start"), request.JSONBody(config))
- c.Assert(err, checker.IsNil)
- c.Assert(waitRun(conName), checker.IsNil)
+ assert.NilError(c, err)
+ assert.NilError(c, waitRun(conName))
networks := inspectField(c, conName, "NetworkSettings.Networks")
- c.Assert(networks, checker.Contains, netName, check.Commentf(fmt.Sprintf("Should contain '%s' network", netName)))
- c.Assert(networks, checker.Not(checker.Contains), "bridge", check.Commentf("Should not contain 'bridge' network"))
+ assert.Assert(c, strings.Contains(networks, netName), "Should contain '%s' network", netName)
+ assert.Assert(c, !strings.Contains(networks, "bridge"), "Should not contain 'bridge' network")
}