From 62e4fb0e7030bf8a64ecf572ae90e8de9076a25b Mon Sep 17 00:00:00 2001 From: William Banfield Date: Tue, 29 Nov 2022 13:48:56 -0500 Subject: [PATCH] exec compose takes context --- test/e2e/pkg/infra/docker/docker.go | 10 +++++----- test/e2e/runner/main.go | 2 +- test/e2e/runner/perturb.go | 11 ++++++----- test/e2e/runner/start.go | 5 +++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/test/e2e/pkg/infra/docker/docker.go b/test/e2e/pkg/infra/docker/docker.go index 24ffa675b..80798e26e 100644 --- a/test/e2e/pkg/infra/docker/docker.go +++ b/test/e2e/pkg/infra/docker/docker.go @@ -35,13 +35,13 @@ func (p *Provider) Setup() error { return nil } func (p Provider) StartTendermint(ctx context.Context, n *e2e.Node) error { - return ExecCompose(p.Testnet.Dir, "start", n.Name) + return ExecCompose(ctx, p.Testnet.Dir, "start", n.Name) } func (p Provider) TerminateTendermint(ctx context.Context, n *e2e.Node) error { - return ExecCompose(p.Testnet.Dir, "kill", "-s", "SIGTERM", n.Name) + return ExecCompose(ctx, p.Testnet.Dir, "kill", "-s", "SIGTERM", n.Name) } func (p Provider) KillTendermint(ctx context.Context, n *e2e.Node) error { - return ExecCompose(p.Testnet.Dir, "kill", "-s", "SIGKILL", n.Name) + return ExecCompose(ctx, p.Testnet.Dir, "kill", "-s", "SIGKILL", n.Name) } // dockerComposeBytes generates a Docker Compose config file for a testnet and returns the @@ -96,8 +96,8 @@ services: } // ExecCompose runs a Docker Compose command for a testnet. -func ExecCompose(dir string, args ...string) error { - return exec.Command(context.Background(), append( +func ExecCompose(ctx context.Context, dir string, args ...string) error { + return exec.Command(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 ec5dfa94a..79279a1a4 100644 --- a/test/e2e/runner/main.go +++ b/test/e2e/runner/main.go @@ -211,7 +211,7 @@ func NewCLI() *CLI { Short: "Stops the Docker testnet", RunE: func(cmd *cobra.Command, args []string) error { logger.Info("Stopping testnet") - return docker.ExecCompose(cli.testnet.Dir, "down") + return docker.ExecCompose(context.Background(), cli.testnet.Dir, "down") }, }) diff --git a/test/e2e/runner/perturb.go b/test/e2e/runner/perturb.go index a08de2332..bab66680b 100644 --- a/test/e2e/runner/perturb.go +++ b/test/e2e/runner/perturb.go @@ -1,6 +1,7 @@ package main import ( + "context" "fmt" "time" @@ -41,26 +42,26 @@ func PerturbNode(node *e2e.Node, perturbation e2e.Perturbation) (*rpctypes.Resul case e2e.PerturbationKill: logger.Info("perturb node", "msg", log.NewLazySprintf("Killing node %v...", node.Name)) - if err := docker.ExecCompose(testnet.Dir, "kill", "-s", "SIGKILL", node.Name); err != nil { + if err := docker.ExecCompose(context.Background(), testnet.Dir, "kill", "-s", "SIGKILL", node.Name); err != nil { return nil, err } - if err := docker.ExecCompose(testnet.Dir, "start", node.Name); err != nil { + if err := docker.ExecCompose(context.Background(), testnet.Dir, "start", node.Name); err != nil { return nil, err } case e2e.PerturbationPause: logger.Info("perturb node", "msg", log.NewLazySprintf("Pausing node %v...", node.Name)) - if err := docker.ExecCompose(testnet.Dir, "pause", node.Name); err != nil { + if err := docker.ExecCompose(context.Background(), testnet.Dir, "pause", node.Name); err != nil { return nil, err } time.Sleep(10 * time.Second) - if err := docker.ExecCompose(testnet.Dir, "unpause", node.Name); err != nil { + if err := docker.ExecCompose(context.Background(), testnet.Dir, "unpause", node.Name); err != nil { return nil, err } case e2e.PerturbationRestart: logger.Info("perturb node", "msg", log.NewLazySprintf("Restarting node %v...", node.Name)) - if err := docker.ExecCompose(testnet.Dir, "restart", node.Name); err != nil { + if err := docker.ExecCompose(context.Background(), testnet.Dir, "restart", node.Name); err != nil { return nil, err } diff --git a/test/e2e/runner/start.go b/test/e2e/runner/start.go index a3082e17d..08dab035f 100644 --- a/test/e2e/runner/start.go +++ b/test/e2e/runner/start.go @@ -1,6 +1,7 @@ package main import ( + "context" "fmt" "sort" "time" @@ -44,7 +45,7 @@ func Start(testnet *e2e.Testnet) error { for len(nodeQueue) > 0 && nodeQueue[0].StartAt == 0 { node := nodeQueue[0] nodeQueue = nodeQueue[1:] - if err := docker.ExecCompose(testnet.Dir, "up", "-d", node.Name); err != nil { + if err := docker.ExecCompose(context.Background(), testnet.Dir, "up", "-d", node.Name); err != nil { return err } if _, err := waitForNode(node, 0, 15*time.Second); err != nil { @@ -98,7 +99,7 @@ func Start(testnet *e2e.Testnet) error { logger.Info("Starting catch up node", "node", node.Name, "height", node.StartAt) - if err := docker.ExecCompose(testnet.Dir, "up", "-d", node.Name); err != nil { + if err := docker.ExecCompose(context.Background(), testnet.Dir, "up", "-d", node.Name); err != nil { return err } status, err := waitForNode(node, node.StartAt, 3*time.Minute)