-
Notifications
You must be signed in to change notification settings - Fork 3.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
test: migrate remaining e2e tests to integration tests #22364
Changes from all commits
81068df
1ac3115
94ddce5
7682f92
654546a
d3b7855
5946743
9a3a6aa
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -113,37 +113,6 @@ jobs: | |
name: "${{ github.sha }}-integration-coverage" | ||
path: ./tests/integration-profile.out | ||
|
||
test-e2e: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- uses: actions/setup-go@v5 | ||
with: | ||
go-version: "1.23" | ||
check-latest: true | ||
cache: true | ||
cache-dependency-path: go.sum | ||
- uses: technote-space/[email protected] | ||
id: git_diff | ||
with: | ||
PATTERNS: | | ||
**/*.go | ||
go.mod | ||
go.sum | ||
**/go.mod | ||
**/go.sum | ||
**/Makefile | ||
Makefile | ||
- name: e2e tests | ||
if: env.GIT_DIFF | ||
run: | | ||
make test-e2e-cov | ||
- uses: actions/upload-artifact@v3 | ||
if: env.GIT_DIFF | ||
with: | ||
name: "${{ github.sha }}-e2e-coverage" | ||
path: ./tests/e2e-profile.out | ||
|
||
test-system: # v2 system tests are in v2-test.yml | ||
runs-on: ubuntu-latest | ||
steps: | ||
|
@@ -186,7 +155,7 @@ jobs: | |
|
||
repo-analysis: | ||
runs-on: ubuntu-latest | ||
needs: [tests, test-integration, test-e2e] | ||
needs: [tests, test-integration] | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- uses: technote-space/[email protected] | ||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package lockup | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/suite" | ||
) | ||
|
||
func TestIntegrationTestSuite(t *testing.T) { | ||
suite.Run(t, NewIntegrationTestSuite()) | ||
} |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -20,23 +20,23 @@ var ( | |||||||||||||||||||||||||||||||||||
accOwner = sdk.AccAddress(ownerAddr) | ||||||||||||||||||||||||||||||||||||
) | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
type E2ETestSuite struct { | ||||||||||||||||||||||||||||||||||||
type IntegrationTestSuite struct { | ||||||||||||||||||||||||||||||||||||
suite.Suite | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
app *simapp.SimApp | ||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
func NewE2ETestSuite() *E2ETestSuite { | ||||||||||||||||||||||||||||||||||||
return &E2ETestSuite{} | ||||||||||||||||||||||||||||||||||||
func NewIntegrationTestSuite() *IntegrationTestSuite { | ||||||||||||||||||||||||||||||||||||
return &IntegrationTestSuite{} | ||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
func (s *E2ETestSuite) SetupSuite() { | ||||||||||||||||||||||||||||||||||||
s.T().Log("setting up e2e test suite") | ||||||||||||||||||||||||||||||||||||
func (s *IntegrationTestSuite) SetupSuite() { | ||||||||||||||||||||||||||||||||||||
s.T().Log("setting up integration test suite") | ||||||||||||||||||||||||||||||||||||
s.app = setupApp(s.T()) | ||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
func (s *E2ETestSuite) TearDownSuite() { | ||||||||||||||||||||||||||||||||||||
s.T().Log("tearing down e2e test suite") | ||||||||||||||||||||||||||||||||||||
func (s *IntegrationTestSuite) TearDownSuite() { | ||||||||||||||||||||||||||||||||||||
s.T().Log("tearing down integration test suite") | ||||||||||||||||||||||||||||||||||||
Comment on lines
+33
to
+39
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion Consider enhancing setup and teardown methods While the basic structure is in place, consider these improvements:
Example enhancement: func (s *IntegrationTestSuite) SetupSuite() {
s.T().Log("setting up integration test suite")
s.app = setupApp(s.T())
+ // Validate app initialization
+ require.NotNil(s.T(), s.app.AccountsKeeper)
+ require.NotNil(s.T(), s.app.BankKeeper)
+ s.T().Log("app initialized with account keeper and bank keeper")
}
func (s *IntegrationTestSuite) TearDownSuite() {
s.T().Log("tearing down integration test suite")
+ // Clean up any remaining state
+ s.app = nil
}
|
||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
func setupApp(t *testing.T) *simapp.SimApp { | ||||||||||||||||||||||||||||||||||||
|
@@ -45,21 +45,21 @@ func setupApp(t *testing.T) *simapp.SimApp { | |||||||||||||||||||||||||||||||||||
return app | ||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
func (s *E2ETestSuite) executeTx(ctx sdk.Context, msg sdk.Msg, app *simapp.SimApp, accAddr, sender []byte) error { | ||||||||||||||||||||||||||||||||||||
func (s *IntegrationTestSuite) executeTx(ctx sdk.Context, msg sdk.Msg, app *simapp.SimApp, accAddr, sender []byte) error { | ||||||||||||||||||||||||||||||||||||
_, err := app.AccountsKeeper.Execute(ctx, accAddr, sender, msg, nil) | ||||||||||||||||||||||||||||||||||||
return err | ||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||
Comment on lines
+48
to
51
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion Enhance error handling in executeTx Consider adding context to the error return to help with debugging test failures. func (s *IntegrationTestSuite) executeTx(ctx sdk.Context, msg sdk.Msg, app *simapp.SimApp, accAddr, sender []byte) error {
_, err := app.AccountsKeeper.Execute(ctx, accAddr, sender, msg, nil)
- return err
+ if err != nil {
+ return fmt.Errorf("failed to execute transaction: %w", err)
+ }
+ return nil
} 📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
func (s *E2ETestSuite) queryAcc(ctx sdk.Context, req sdk.Msg, app *simapp.SimApp, accAddr []byte) (transaction.Msg, error) { | ||||||||||||||||||||||||||||||||||||
func (s *IntegrationTestSuite) queryAcc(ctx sdk.Context, req sdk.Msg, app *simapp.SimApp, accAddr []byte) (transaction.Msg, error) { | ||||||||||||||||||||||||||||||||||||
resp, err := app.AccountsKeeper.Query(ctx, accAddr, req) | ||||||||||||||||||||||||||||||||||||
return resp, err | ||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||
Comment on lines
+53
to
56
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion Add type safety to queryAcc method The method could benefit from generic type parameters to ensure type safety at compile time. -func (s *IntegrationTestSuite) queryAcc(ctx sdk.Context, req sdk.Msg, app *simapp.SimApp, accAddr []byte) (transaction.Msg, error) {
+func (s *IntegrationTestSuite) queryAcc[T transaction.Msg](ctx sdk.Context, req sdk.Msg, app *simapp.SimApp, accAddr []byte) (T, error) {
resp, err := app.AccountsKeeper.Query(ctx, accAddr, req)
- return resp, err
+ if err != nil {
+ var zero T
+ return zero, fmt.Errorf("query failed: %w", err)
+ }
+ result, ok := resp.(T)
+ if !ok {
+ var zero T
+ return zero, fmt.Errorf("unexpected response type: got %T, want %T", resp, zero)
+ }
+ return result, nil
} 📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
func (s *E2ETestSuite) fundAccount(app *simapp.SimApp, ctx sdk.Context, addr sdk.AccAddress, amt sdk.Coins) { | ||||||||||||||||||||||||||||||||||||
func (s *IntegrationTestSuite) fundAccount(app *simapp.SimApp, ctx sdk.Context, addr sdk.AccAddress, amt sdk.Coins) { | ||||||||||||||||||||||||||||||||||||
require.NoError(s.T(), testutil.FundAccount(ctx, app.BankKeeper, addr, amt)) | ||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
func (s *E2ETestSuite) queryLockupAccInfo(ctx sdk.Context, app *simapp.SimApp, accAddr []byte) *types.QueryLockupAccountInfoResponse { | ||||||||||||||||||||||||||||||||||||
func (s *IntegrationTestSuite) queryLockupAccInfo(ctx sdk.Context, app *simapp.SimApp, accAddr []byte) *types.QueryLockupAccountInfoResponse { | ||||||||||||||||||||||||||||||||||||
req := &types.QueryLockupAccountInfoRequest{} | ||||||||||||||||||||||||||||||||||||
resp, err := s.queryAcc(ctx, req, app, accAddr) | ||||||||||||||||||||||||||||||||||||
require.NoError(s.T(), err) | ||||||||||||||||||||||||||||||||||||
|
Original file line number | Diff line number | Diff line change | ||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -18,19 +18,19 @@ import ( | |||||||||||||||||||
sdk "github.com/cosmos/cosmos-sdk/types" | ||||||||||||||||||||
) | ||||||||||||||||||||
|
||||||||||||||||||||
type E2ETestSuite struct { | ||||||||||||||||||||
type IntegrationTestSuite struct { | ||||||||||||||||||||
suite.Suite | ||||||||||||||||||||
|
||||||||||||||||||||
app *simapp.SimApp | ||||||||||||||||||||
members []sdk.AccAddress | ||||||||||||||||||||
membersAddr []string | ||||||||||||||||||||
} | ||||||||||||||||||||
|
||||||||||||||||||||
func NewE2ETestSuite() *E2ETestSuite { | ||||||||||||||||||||
return &E2ETestSuite{} | ||||||||||||||||||||
func NewIntegrationTestSuite() *IntegrationTestSuite { | ||||||||||||||||||||
return &IntegrationTestSuite{} | ||||||||||||||||||||
} | ||||||||||||||||||||
Comment on lines
+29
to
31
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion Consider initializing fields in the constructor. The constructor could be enhanced to initialize the members slice and potentially the app instance, making the test suite setup more explicit. func NewIntegrationTestSuite() *IntegrationTestSuite {
- return &IntegrationTestSuite{}
+ return &IntegrationTestSuite{
+ members: make([]sdk.AccAddress, 0),
+ membersAddr: make([]string, 0),
+ }
} 📝 Committable suggestion
Suggested change
|
||||||||||||||||||||
|
||||||||||||||||||||
func (s *E2ETestSuite) SetupSuite() { | ||||||||||||||||||||
func (s *IntegrationTestSuite) SetupSuite() { | ||||||||||||||||||||
s.app = setupApp(s.T()) | ||||||||||||||||||||
|
||||||||||||||||||||
s.members = []sdk.AccAddress{} | ||||||||||||||||||||
|
@@ -43,31 +43,31 @@ func (s *E2ETestSuite) SetupSuite() { | |||||||||||||||||||
} | ||||||||||||||||||||
} | ||||||||||||||||||||
|
||||||||||||||||||||
func (s *E2ETestSuite) TearDownSuite() {} | ||||||||||||||||||||
func (s *IntegrationTestSuite) TearDownSuite() {} | ||||||||||||||||||||
|
||||||||||||||||||||
func setupApp(t *testing.T) *simapp.SimApp { | ||||||||||||||||||||
t.Helper() | ||||||||||||||||||||
app := simapp.Setup(t, false) | ||||||||||||||||||||
return app | ||||||||||||||||||||
} | ||||||||||||||||||||
|
||||||||||||||||||||
func (s *E2ETestSuite) executeTx(ctx context.Context, msg sdk.Msg, accAddr, sender []byte) error { | ||||||||||||||||||||
func (s *IntegrationTestSuite) executeTx(ctx context.Context, msg sdk.Msg, accAddr, sender []byte) error { | ||||||||||||||||||||
_, err := s.app.AccountsKeeper.Execute(ctx, accAddr, sender, msg, nil) | ||||||||||||||||||||
return err | ||||||||||||||||||||
} | ||||||||||||||||||||
|
||||||||||||||||||||
func (s *E2ETestSuite) queryAcc(ctx context.Context, req sdk.Msg, accAddr []byte) (transaction.Msg, error) { | ||||||||||||||||||||
func (s *IntegrationTestSuite) queryAcc(ctx context.Context, req sdk.Msg, accAddr []byte) (transaction.Msg, error) { | ||||||||||||||||||||
resp, err := s.app.AccountsKeeper.Query(ctx, accAddr, req) | ||||||||||||||||||||
return resp, err | ||||||||||||||||||||
} | ||||||||||||||||||||
|
||||||||||||||||||||
func (s *E2ETestSuite) fundAccount(ctx context.Context, addr sdk.AccAddress, amt sdk.Coins) { | ||||||||||||||||||||
func (s *IntegrationTestSuite) fundAccount(ctx context.Context, addr sdk.AccAddress, amt sdk.Coins) { | ||||||||||||||||||||
require.NoError(s.T(), testutil.FundAccount(ctx, s.app.BankKeeper, addr, amt)) | ||||||||||||||||||||
} | ||||||||||||||||||||
|
||||||||||||||||||||
// initAccount initializes a multisig account with the given members and powers | ||||||||||||||||||||
// and returns the account address | ||||||||||||||||||||
func (s *E2ETestSuite) initAccount(ctx context.Context, sender []byte, membersPowers map[string]uint64) ([]byte, string) { | ||||||||||||||||||||
func (s *IntegrationTestSuite) initAccount(ctx context.Context, sender []byte, membersPowers map[string]uint64) ([]byte, string) { | ||||||||||||||||||||
s.fundAccount(ctx, sender, sdk.Coins{sdk.NewCoin("stake", math.NewInt(1000000))}) | ||||||||||||||||||||
|
||||||||||||||||||||
members := []*v1.Member{} | ||||||||||||||||||||
|
@@ -95,7 +95,7 @@ func (s *E2ETestSuite) initAccount(ctx context.Context, sender []byte, membersPo | |||||||||||||||||||
} | ||||||||||||||||||||
|
||||||||||||||||||||
// createProposal | ||||||||||||||||||||
func (s *E2ETestSuite) createProposal(ctx context.Context, accAddr, sender []byte, msgs ...*codectypes.Any) { | ||||||||||||||||||||
func (s *IntegrationTestSuite) createProposal(ctx context.Context, accAddr, sender []byte, msgs ...*codectypes.Any) { | ||||||||||||||||||||
propReq := &v1.MsgCreateProposal{ | ||||||||||||||||||||
Proposal: &v1.Proposal{ | ||||||||||||||||||||
Title: "test", | ||||||||||||||||||||
|
@@ -107,7 +107,7 @@ func (s *E2ETestSuite) createProposal(ctx context.Context, accAddr, sender []byt | |||||||||||||||||||
s.NoError(err) | ||||||||||||||||||||
} | ||||||||||||||||||||
|
||||||||||||||||||||
func (s *E2ETestSuite) executeProposal(ctx context.Context, accAddr, sender []byte, proposalID uint64) error { | ||||||||||||||||||||
func (s *IntegrationTestSuite) executeProposal(ctx context.Context, accAddr, sender []byte, proposalID uint64) error { | ||||||||||||||||||||
execReq := &v1.MsgExecuteProposal{ | ||||||||||||||||||||
ProposalId: proposalID, | ||||||||||||||||||||
} | ||||||||||||||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and this one |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,17 @@ | ||
package keeper | ||
package keeper_test | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/require" | ||
|
||
authTest "github.com/cosmos/cosmos-sdk/tests/integration/auth/keeper" | ||
"github.com/cosmos/cosmos-sdk/testutil/network" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is there any reason for having There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's in the same package. Tests are with |
||
"github.com/cosmos/cosmos-sdk/x/auth/types" | ||
) | ||
|
||
func TestAccountRetriever(t *testing.T) { | ||
cfg, err := network.DefaultConfigWithAppConfig(AppConfig) | ||
cfg, err := network.DefaultConfigWithAppConfig(authTest.AppConfig) | ||
require.NoError(t, err) | ||
cfg.NumValidators = 1 | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like those was pulled in with build failures
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These tests required utils functions which were deleted earlier with this commit, which got unnoticed. Will raise a PR with fix.