Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Remove parallel execution in e2e tests #632

Merged
merged 2 commits into from
Jul 8, 2022
Merged

Remove parallel execution in e2e tests #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1f4dbd
Remove unnecessary log
zivkovicmilos Jul 8, 2022
3b4b225
Remove parallel execution from e2e tests
zivkovicmilos Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions e2e/framework/testserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,6 @@ func (t *TestServer) Start(ctx context.Context) error {
defer cancel()

if _, err := t.Operator().GetStatus(ctx, &empty.Empty{}); err != nil {
t.t.Logf("failed to get status from server: %+v", err)

return nil, true
}

Expand Down
22 changes: 8 additions & 14 deletions e2e/ibft_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ import (
and verifies it was mined
**/
func TestIbft_Transfer(t *testing.T) {
t.Parallel()

testCases := []struct {
name string
blockTime uint64
Expand All @@ -46,11 +44,7 @@ func TestIbft_Transfer(t *testing.T) {
)

for _, tc := range testCases {
tc := tc

t.Run(tc.name, func(t *testing.T) {
t.Parallel()

ibftManager := framework.NewIBFTServersManager(t,
IBFTMinNodes,
IBFTDirPrefix,
Expand Down Expand Up @@ -89,15 +83,16 @@ func TestIbft_Transfer(t *testing.T) {
SendRawTx(ctxForTx, txn, senderKey)

assert.NoError(t, err)
assert.NotNil(t, receipt)
if receipt == nil {
t.Fatalf("receipt not received")
}

assert.NotNil(t, receipt.TransactionHash)
})
}
}

func TestIbft_TransactionFeeRecipient(t *testing.T) {
t.Parallel()

testCases := []struct {
name string
contractCall bool
Expand All @@ -116,11 +111,7 @@ func TestIbft_TransactionFeeRecipient(t *testing.T) {
}

for _, tc := range testCases {
tc := tc

t.Run(tc.name, func(t *testing.T) {
t.Parallel()

senderKey, senderAddr := tests.GenerateKeyAndAddr(t)
_, receiverAddr := tests.GenerateKeyAndAddr(t)

Expand Down Expand Up @@ -172,7 +163,10 @@ func TestIbft_TransactionFeeRecipient(t *testing.T) {
defer cancel1()
receipt, err := srv.SendRawTx(ctx1, txn, senderKey)
assert.NoError(t, err)
assert.NotNil(t, receipt)

if receipt == nil {
t.Fatalf("receipt not received")
}

// Get the block proposer from the extra data seal
assert.NotNil(t, receipt.BlockHash)
Expand Down