1. docker
  2. Commit 7ae6aa420d542bef1d10eef961718cff53af4c46
Browse code

integration-cli: remove TestingT

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 231ed42cab0cb070a125e63b5baff332fbf7031f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Tibor Vass authored on 2019/09/10 06:45:43
Showing 2 changed files
integration-cli/cli/cli.go
History View file @ 7ae6aa4
... ... 
@@ -30,10 +30,6 @@ type testingT interface {
30 30 
 	Fatalf(string, ...interface{})
31 31 
 }
32 32
33 
-type TestingT interface {
34 
-	testingT
35 
-}
36 
-
37 33 
 // DockerCmd executes the specified docker command and expect a success
38 34 
 func DockerCmd(t testingT, args ...string) *icmd.Result {
39 35 
 	return Docker(Args(args...)).Assert(t, icmd.Success)
integration-cli/docker_utils_test.go
History View file @ 7ae6aa4
... ... 
@@ -40,7 +40,7 @@ func dockerCmdWithError(args ...string) (string, int, error) {
40 40 
 }
41 41
42 42 
 // Deprecated: use cli.Docker or cli.DockerCmd
43 
-func dockerCmd(c cli.TestingT, args ...string) (string, int) {
43 
+func dockerCmd(c testing.TB, args ...string) (string, int) {
44 44 
 	result := cli.DockerCmd(c, args...)
45 45 
 	return result.Combined(), result.ExitCode
46 46 
 }