diff --git a/test/e2e/pkg/infra/docker/docker.go b/test/e2e/pkg/infra/docker/docker.go index f9d239274..a74f7b5b5 100644 --- a/test/e2e/pkg/infra/docker/docker.go +++ b/test/e2e/pkg/infra/docker/docker.go @@ -109,7 +109,7 @@ func ExecComposeVerbose(dir string, args ...string) error { args...)...) } -// ExecDocker runs a Docker command. -func ExecDocker(args ...string) error { +// Exec runs a Docker command. +func Exec(args ...string) error { return exec.Command(context.Background(), append([]string{"docker"}, args...)...) } diff --git a/test/e2e/runner/cleanup.go b/test/e2e/runner/cleanup.go index 74e84f7fc..5df402be8 100644 --- a/test/e2e/runner/cleanup.go +++ b/test/e2e/runner/cleanup.go @@ -10,6 +10,7 @@ import ( "github.com/tendermint/tendermint/libs/log" e2e "github.com/tendermint/tendermint/test/e2e/pkg" "github.com/tendermint/tendermint/test/e2e/pkg/exec" + "github.com/tendermint/tendermint/test/e2e/pkg/infra/docker" ) // Cleanup removes the Docker Compose containers and testnet directory. @@ -71,7 +72,7 @@ func cleanupDir(dir string) error { if err != nil { return err } - err = execDocker("run", "--rm", "--entrypoint", "", "-v", fmt.Sprintf("%v:/network", absDir), + err = docker.Exec("run", "--rm", "--entrypoint", "", "-v", fmt.Sprintf("%v:/network", absDir), "tendermint/e2e-node", "sh", "-c", "rm -rf /network/*/") if err != nil { return err diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go index 623225813..ec5dfa94a 100644 --- a/test/e2e/runner/main.go +++ b/test/e2e/runner/main.go @@ -276,7 +276,7 @@ func NewCLI() *CLI { Use: "logs", Short: "Shows the testnet logs", RunE: func(cmd *cobra.Command, args []string) error { - return execComposeVerbose(cli.testnet.Dir, "logs") + return docker.ExecComposeVerbose(cli.testnet.Dir, "logs") }, }) @@ -284,7 +284,7 @@ func NewCLI() *CLI { Use: "tail", Short: "Tails the testnet logs", RunE: func(cmd *cobra.Command, args []string) error { - return execComposeVerbose(cli.testnet.Dir, "logs", "--follow") + return docker.ExecComposeVerbose(cli.testnet.Dir, "logs", "--follow") }, }) diff --git a/test/e2e/runner/perturb.go b/test/e2e/runner/perturb.go index 5180774d9..a08de2332 100644 --- a/test/e2e/runner/perturb.go +++ b/test/e2e/runner/perturb.go @@ -31,11 +31,11 @@ func PerturbNode(node *e2e.Node, perturbation e2e.Perturbation) (*rpctypes.Resul switch perturbation { case e2e.PerturbationDisconnect: logger.Info("perturb node", "msg", log.NewLazySprintf("Disconnecting node %v...", node.Name)) - if err := execDocker("network", "disconnect", testnet.Name+"_"+testnet.Name, node.Name); err != nil { + if err := docker.Exec("network", "disconnect", testnet.Name+"_"+testnet.Name, node.Name); err != nil { return nil, err } time.Sleep(10 * time.Second) - if err := execDocker("network", "connect", testnet.Name+"_"+testnet.Name, node.Name); err != nil { + if err := docker.Exec("network", "connect", testnet.Name+"_"+testnet.Name, node.Name); err != nil { return nil, err }