mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-09 06:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

start and create calls replaced with infra provider

Browse Source
This commit is contained in:
William Banfield
2022-11-30 12:06:30 -05:00
parent eec848b408
commit 0cafe89301
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/runner/main.go
View File

@@ -112,7 +112,7 @@ func NewCLI() *CLI {
chLoadResult <- err
}()
if err := Start(cli.testnet); err != nil {
if err := Start(cli.testnet, cli.infp); err != nil {
return err
}
@@ -186,7 +186,7 @@ func NewCLI() *CLI {
if err != nil {
return err
}
return Start(cli.testnet)
return Start(cli.testnet, cli.infp)
},
})
@@ -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(context.Background(), cli.testnet.Dir, "down")
return docker.ExecCompose(context.Background(), cli.testnet.Dir, "down")
},
})
@@ -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(context.Background(), 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(context.Background(), cli.testnet.Dir, "logs", "--follow")
return docker.ExecComposeVerbose(context.Background(), cli.testnet.Dir, "logs", "--follow")
},
})
@@ -309,7 +309,7 @@ Does not run any perturbations.
chLoadResult <- err
}()
if err := Start(cli.testnet); err != nil {
if err := Start(cli.testnet, cli.infp); err != nil {
return err
}

18
test/e2e/runner/start.go
View File

@@ -8,10 +8,10 @@ import (
"github.com/tendermint/tendermint/libs/log"
e2e "github.com/tendermint/tendermint/test/e2e/pkg"
"github.com/tendermint/tendermint/test/e2e/pkg/infra/docker"
"github.com/tendermint/tendermint/test/e2e/pkg/infra"
)
func Start(testnet *e2e.Testnet) error {
func Start(testnet *e2e.Testnet, p infra.Provider) error {
if len(testnet.Nodes) == 0 {
return fmt.Errorf("no nodes in testnet")
}
@@ -45,7 +45,12 @@ func Start(testnet *e2e.Testnet) error {
for len(nodeQueue) > 0 && nodeQueue[0].StartAt == 0 {
node := nodeQueue[0]
nodeQueue = nodeQueue[1:]
if err := docker.ExecCompose(context.Background(), testnet.Dir, "up", "-d", node.Name); err != nil {
err := p.CreateNode(context.Background(), node)
if err != nil {
return err
}
err = p.StartTendermint(context.Background(), node)
if err != nil {
return err
}
if _, err := waitForNode(node, 0, 15*time.Second); err != nil {
@@ -99,7 +104,12 @@ func Start(testnet *e2e.Testnet) error {
logger.Info("Starting catch up node", "node", node.Name, "height", node.StartAt)
if err := docker.ExecCompose(context.Background(), testnet.Dir, "up", "-d", node.Name); err != nil {
err := p.CreateNode(context.Background(), node)
if err != nil {
return err
}
err = p.StartTendermint(context.Background(), node)
if err != nil {
return err
}
status, err := waitForNode(node, node.StartAt, 3*time.Minute)