From eb46fdc720bb88aa99d58cc33580bd5e31226bca Mon Sep 17 00:00:00 2001 From: William Banfield Date: Tue, 29 Nov 2022 13:49:56 -0500 Subject: [PATCH] compose verbose takes context --- test/e2e/pkg/infra/docker/docker.go | 4 ++-- test/e2e/runner/main.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/pkg/infra/docker/docker.go b/test/e2e/pkg/infra/docker/docker.go index 80798e26e..19a2934aa 100644 --- a/test/e2e/pkg/infra/docker/docker.go +++ b/test/e2e/pkg/infra/docker/docker.go @@ -103,8 +103,8 @@ func ExecCompose(ctx context.Context, dir string, args ...string) error { } // ExecComposeVerbose runs a Docker Compose command for a testnet and displays its output. -func ExecComposeVerbose(dir string, args ...string) error { - return exec.CommandVerbose(context.Background(), append( +func ExecComposeVerbose(ctx context.Context, dir string, args ...string) error { + return exec.CommandVerbose(ctx, append( []string{"docker-compose", "-f", filepath.Join(dir, "docker-compose.yml")}, args...)...) } diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go index bcea17956..1c3840080 100644 --- a/test/e2e/runner/main.go +++ b/test/e2e/runner/main.go @@ -266,7 +266,7 @@ func NewCLI() *CLI { Use: "logs", Short: "Shows the testnet logs", RunE: func(cmd *cobra.Command, args []string) error { - return docker.ExecComposeVerbose(cli.testnet.Dir, "logs") + return docker.ExecComposeVerbose(context.Background(), cli.testnet.Dir, "logs") }, }) @@ -274,7 +274,7 @@ func NewCLI() *CLI { Use: "tail", Short: "Tails the testnet logs", RunE: func(cmd *cobra.Command, args []string) error { - return docker.ExecComposeVerbose(cli.testnet.Dir, "logs", "--follow") + return docker.ExecComposeVerbose(context.Background(), cli.testnet.Dir, "logs", "--follow") }, })