mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-08-20 06:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

all exec switched to docker package

Browse Source
This commit is contained in:
William Banfield
2022-11-30 17:50:27 -05:00
parent b762c87ffa
commit c72f7c01b1
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e/pkg/infra/docker/docker.go
+2 -2
View File
@@ -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...)...)
}
test/e2e/runner/cleanup.go
+2 -1
View File
@@ -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
test/e2e/runner/main.go
+2 -2
View File
@@ -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")
},
})
test/e2e/runner/perturb.go
+2 -2
View File
@@ -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
}