From 6088db6b56be957f8f2cd092507aba719de7a1b1 Mon Sep 17 00:00:00 2001 From: Felipe Madero Date: Fri, 7 Feb 2025 18:06:53 -0300 Subject: [PATCH] fix e2e --- pkg/node/local.go | 2 +- scripts/run.e2e.sh | 26 +++++++++---------- .../subnet/sov/addRemoveValidatorPoA/suite.go | 2 +- .../subnet/sov/addRemoveValidatorPoS/suite.go | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/node/local.go b/pkg/node/local.go index 53c3cc5f5..fe48e9c1d 100644 --- a/pkg/node/local.go +++ b/pkg/node/local.go @@ -118,7 +118,7 @@ func TrackSubnetWithLocalMachine( return fmt.Errorf("failed to update sidecar with new node info: %w", err) } } - ux.Logger.PrintToUser("Waiting for blockchain %s to be bootstrapped", blockchainName) + ux.Logger.PrintToUser("Waiting for blockchain %s ID %s to be bootstrapped", blockchainName, blockchainID.String()) if err := WaitBootstrapped(ctx, cli, blockchainID.String()); err != nil { return fmt.Errorf("failure waiting for local cluster %s bootstrapping: %w", blockchainName, err) } diff --git a/scripts/run.e2e.sh b/scripts/run.e2e.sh index a26bac6c2..02b04d48f 100755 --- a/scripts/run.e2e.sh +++ b/scripts/run.e2e.sh @@ -27,20 +27,20 @@ if [ "$current_user" = "runner" ] && [[ "$OSTYPE" == "linux-gnu"* ]]; then sudo docker system prune -f || echo "failed to cleanup docker" fi -if [ ! -d "tests/e2e/hardhat/node_modules" ] -then - pushd tests/e2e/hardhat - yarn - popd -fi +#if [ ! -d "tests/e2e/hardhat/node_modules" ] +#then +# pushd tests/e2e/hardhat +# yarn +# popd +#fi -if [ ! -d "tests/e2e/ledgerSim/node_modules" ] -then - pushd tests/e2e/ledgerSim - yarn - cp node_modules/@zondax/zemu/dist/src/grpc/zemu.proto node_modules/@zondax/zemu/dist/grpc/zemu.proto - popd -fi +#if [ ! -d "tests/e2e/ledgerSim/node_modules" ] +#then +# pushd tests/e2e/ledgerSim +# yarn +# cp node_modules/@zondax/zemu/dist/src/grpc/zemu.proto node_modules/@zondax/zemu/dist/grpc/zemu.proto +# popd +#fi # Set the CGO flags to use the portable version of BLST # diff --git a/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoA/suite.go b/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoA/suite.go index f0016975e..9130d554c 100644 --- a/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoA/suite.go +++ b/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoA/suite.go @@ -74,7 +74,7 @@ var _ = ginkgo.Describe("[Etna AddRemove Validator SOV PoA]", func() { gomega.Expect(err).Should(gomega.BeNil()) fmt.Println(output) // parse blockchainID from output - re := regexp.MustCompile(`Waiting for rpc http://.*?/bc/([A-Za-z0-9]+)/rpc`) + re := regexp.MustCompile(`Waiting for blockchain .* ID ([A-Za-z0-9]+) to be bootstrapped`) // Find the first match match := re.FindStringSubmatch(output) gomega.Expect(match).ToNot(gomega.BeEmpty()) diff --git a/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoS/suite.go b/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoS/suite.go index b28edd72b..2de73ec3a 100644 --- a/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoS/suite.go +++ b/tests/e2e/testcases/subnet/sov/addRemoveValidatorPoS/suite.go @@ -76,7 +76,7 @@ var _ = ginkgo.Describe("[Etna AddRemove Validator SOV PoS]", func() { gomega.Expect(err).Should(gomega.BeNil()) fmt.Println(output) // parse blockchainID from output - re := regexp.MustCompile(`Waiting for rpc http://.*?/bc/([A-Za-z0-9]+)/rpc`) + re := regexp.MustCompile(`Waiting for blockchain .* ID ([A-Za-z0-9]+) to be bootstrapped`) // Find the first match match := re.FindStringSubmatch(output) gomega.Expect(match).ToNot(gomega.BeEmpty())