From 684ee627d1752c760a3e492a307619e4b586afd5 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 27 Sep 2022 19:39:04 +0200 Subject: [PATCH] fix: attempt at fixing flaky e2e tests (#13401) * fix: attempt at fixing flaky e2e tests * `make format` * add links --- .github/workflows/build-skip.yml | 1 + .github/workflows/test-e2e-skip.yml | 1 + .github/workflows/test-integration-skip.yml | 1 + baseapp/baseapp.go | 1 - tests/e2e/group/tx.go | 2 ++ x/auth/client/testutil/suite.go | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-skip.yml b/.github/workflows/build-skip.yml index bbcd02f30371..c96e8a1022db 100644 --- a/.github/workflows/build-skip.yml +++ b/.github/workflows/build-skip.yml @@ -1,5 +1,6 @@ name: Build SimApp # This workflow allows to skip the build step if the PR does not contain any changes to the code +# See https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks on: pull_request: paths-ignore: diff --git a/.github/workflows/test-e2e-skip.yml b/.github/workflows/test-e2e-skip.yml index c4622f3dc502..41ab5415225b 100644 --- a/.github/workflows/test-e2e-skip.yml +++ b/.github/workflows/test-e2e-skip.yml @@ -1,5 +1,6 @@ name: Tests E2E # This workflow allows to skip the e2e step if the PR does not contain any changes to the code +# See https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks on: pull_request: paths-ignore: diff --git a/.github/workflows/test-integration-skip.yml b/.github/workflows/test-integration-skip.yml index 3c0fef380327..e8621fdc5e73 100644 --- a/.github/workflows/test-integration-skip.yml +++ b/.github/workflows/test-integration-skip.yml @@ -1,5 +1,6 @@ name: Tests Integration # This workflow allows to skip the integration step if the PR does not contain any changes to the code +# See https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks on: pull_request: paths-ignore: diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 98d4b3bedd42..247099390985 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -270,7 +270,6 @@ func (app *BaseApp) MountStore(key storetypes.StoreKey, typ storetypes.StoreType // LoadLatestVersion loads the latest application version. It will panic if // called more than once on a running BaseApp. func (app *BaseApp) LoadLatestVersion() error { - err := app.storeLoader(app.cms) if err != nil { return fmt.Errorf("failed to load latest version: %w", err) diff --git a/tests/e2e/group/tx.go b/tests/e2e/group/tx.go index 7488806c798e..c50ef6f0fc3d 100644 --- a/tests/e2e/group/tx.go +++ b/tests/e2e/group/tx.go @@ -2151,6 +2151,8 @@ func (s *IntegrationTestSuite) TestTxLeaveGroup() { ), ) s.Require().NoError(err, out.String()) + s.Require().NoError(s.network.WaitForNextBlock()) + var txResp sdk.TxResponse s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &txResp), out.String()) txResp, err = clitestutil.GetTxResponse(s.network, val.ClientCtx, txResp.TxHash) diff --git a/x/auth/client/testutil/suite.go b/x/auth/client/testutil/suite.go index 9ac15b7aa2de..b4620fe4f7cc 100644 --- a/x/auth/client/testutil/suite.go +++ b/x/auth/client/testutil/suite.go @@ -1587,6 +1587,7 @@ func (s *IntegrationTestSuite) TestSignWithMultiSignersAminoJSON() { ) require.NoError(err) require.NoError(s.network.WaitForNextBlock()) + require.NoError(s.network.WaitForNextBlock()) var txRes sdk.TxResponse require.NoError(val0.ClientCtx.Codec.UnmarshalJSON(res.Bytes(), &txRes))