From 7ae6aa420d542bef1d10eef961718cff53af4c46 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Mon, 9 Sep 2019 21:45:43 +0000 Subject: [PATCH] integration-cli: remove TestingT Signed-off-by: Tibor Vass (cherry picked from commit 231ed42cab0cb070a125e63b5baff332fbf7031f) Signed-off-by: Sebastiaan van Stijn --- integration-cli/cli/cli.go | 4 ---- integration-cli/docker_utils_test.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/integration-cli/cli/cli.go b/integration-cli/cli/cli.go index 6d38c8ba80..bc3f3c194e 100644 --- a/integration-cli/cli/cli.go +++ b/integration-cli/cli/cli.go @@ -30,10 +30,6 @@ type testingT interface { Fatalf(string, ...interface{}) } -type TestingT interface { - testingT -} - // DockerCmd executes the specified docker command and expect a success func DockerCmd(t testingT, args ...string) *icmd.Result { return Docker(Args(args...)).Assert(t, icmd.Success) diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go index e70e91a418..aaeb03d8d8 100644 --- a/integration-cli/docker_utils_test.go +++ b/integration-cli/docker_utils_test.go @@ -40,7 +40,7 @@ func dockerCmdWithError(args ...string) (string, int, error) { } // 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...) return result.Combined(), result.ExitCode }