kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

integration-cli: remove TestingT 

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 231ed42cab)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Tibor Vass 2019-09-09 21:45:43 +00:00 committed by Sebastiaan van Stijn
parent 4c3e2dc441
commit 7ae6aa420d
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration-cli/cli/cli.go
View File

@ -30,10 +30,6 @@ type testingT interface {
Fatalf(string, ...interface{}) Fatalf(string, ...interface{})
} }
type TestingT interface {
testingT
}
// DockerCmd executes the specified docker command and expect a success // DockerCmd executes the specified docker command and expect a success
func DockerCmd(t testingT, args ...string) *icmd.Result { func DockerCmd(t testingT, args ...string) *icmd.Result {
return Docker(Args(args...)).Assert(t, icmd.Success) return Docker(Args(args...)).Assert(t, icmd.Success)

2
integration-cli/docker_utils_test.go
View File

@ -40,7 +40,7 @@ func dockerCmdWithError(args ...string) (string, int, error) {
} }
// Deprecated: use cli.Docker or cli.DockerCmd // Deprecated: use cli.Docker or cli.DockerCmd
func dockerCmd(c cli.TestingT, args ...string) (string, int) { func dockerCmd(c testing.TB, args ...string) (string, int) {
result := cli.DockerCmd(c, args...) result := cli.DockerCmd(c, args...)
return result.Combined(), result.ExitCode return result.Combined(), result.ExitCode
} }