Skip to content

testing: remove Parallel from txnproofs and fix timeout bug #3628

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

Merged
tsachiherman merged 2 commits into from
Feb 15, 2022
Merged

testing: remove Parallel from txnproofs and fix timeout bug #3628

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
f3fea11
remove Parallel from txnproofs and fix timeout bug
Feb 14, 2022
a4d7432
pushing timeout up to 30 sec
Feb 14, 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
1 change: 0 additions & 1 deletion test/e2e-go/features/transactions/proof_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ func TestTxnMerkleProof(t *testing.T) {
partitiontest.PartitionTest(t)
defer fixtures.ShutdownSynchronizedTest(t)

t.Parallel()
a := require.New(fixtures.SynchronizedTest(t))

var fixture fixtures.RestClientFixture
Expand Down
14 changes: 7 additions & 7 deletions test/e2e-go/restAPI/restClient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func waitForTransaction(t *testing.T, testClient libgoal.Client, fromAddress, tx
if rnd.LastRound == 0 {
t.Fatal("it is currently round 0 but we need to wait for a transaction that might happen this round but we'll never know if that happens because ConfirmedRound==0 is indestinguishable from not having happened")
}
timeoutTime := time.Now().Add(30 * time.Second)
timeoutTime := time.Now().Add(timeout)
Copy link
Copy Markdown
Contributor

@tsachiherman tsachiherman Feb 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we're using this method in 6 places : in 3 calls we pass in 15 seconds, and in 3 calls we pass 30 seconds.

so, for the cases where the timeout was 15 second, we're going to wait now 15 seconds instead of 30 seconds.
Would that trigger any fail cases ?

Copy link
Copy Markdown
Contributor Author

@id-ms id-ms Feb 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should increase the timeout to be at least 30 sec.
what do you think?

Copy link
Copy Markdown
Contributor

@tsachiherman tsachiherman Feb 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(note that I do think that this is the correct course of action)

for {
tx, err = testClient.TransactionInformation(fromAddress, txID)
if err != nil && strings.HasPrefix(err.Error(), "HTTP 404") {
Expand Down Expand Up @@ -250,7 +250,7 @@ func TestTransactionsByAddr(t *testing.T) {
rnd, err := testClient.Status()
a.NoError(err)
t.Logf("rnd[%d] created txn %s", rnd.LastRound, txID)
_, err = waitForTransaction(t, testClient, someAddress, txID.String(), 15*time.Second)
_, err = waitForTransaction(t, testClient, someAddress, txID.String(), 30*time.Second)
a.NoError(err)

// what is my round?
Expand Down Expand Up @@ -468,7 +468,7 @@ func TestClientCanSendAndGetNote(t *testing.T) {
note := make([]byte, maxTxnNoteBytes)
tx, err := testClient.SendPaymentFromWallet(wh, nil, someAddress, toAddress, 10000, 100000, note, "", 0, 0)
a.NoError(err)
txStatus, err := waitForTransaction(t, testClient, someAddress, tx.ID().String(), 15*time.Second)
txStatus, err := waitForTransaction(t, testClient, someAddress, tx.ID().String(), 30*time.Second)
a.NoError(err)
a.Equal(note, txStatus.Note)
}
Expand All @@ -494,7 +494,7 @@ func TestClientCanGetTransactionStatus(t *testing.T) {
t.Log(string(protocol.EncodeJSON(tx)))
a.NoError(err)
t.Log(tx.ID().String())
_, err = waitForTransaction(t, testClient, someAddress, tx.ID().String(), 15*time.Second)
_, err = waitForTransaction(t, testClient, someAddress, tx.ID().String(), 30*time.Second)
a.NoError(err)
}

Expand All @@ -519,7 +519,7 @@ func TestAccountBalance(t *testing.T) {
a.NoError(err)
tx, err := testClient.SendPaymentFromWallet(wh, nil, someAddress, toAddress, 10000, 100000, nil, "", 0, 0)
a.NoError(err)
_, err = waitForTransaction(t, testClient, someAddress, tx.ID().String(), 15*time.Second)
_, err = waitForTransaction(t, testClient, someAddress, tx.ID().String(), 30*time.Second)
a.NoError(err)

account, err := testClient.AccountInformation(toAddress)
Expand Down Expand Up @@ -584,7 +584,7 @@ func TestAccountParticipationInfo(t *testing.T) {
}
txID, err := testClient.SignAndBroadcastTransaction(wh, nil, tx)
a.NoError(err)
_, err = waitForTransaction(t, testClient, someAddress, txID, 15*time.Second)
_, err = waitForTransaction(t, testClient, someAddress, txID, 30*time.Second)
a.NoError(err)

account, err := testClient.AccountInformation(someAddress)
Expand Down Expand Up @@ -1220,7 +1220,7 @@ func TestNilStateProofInParticipationInfo(t *testing.T) {
}
txID, err := testClient.SignAndBroadcastTransaction(wh, nil, tx)
a.NoError(err)
_, err = waitForTransaction(t, testClient, someAddress, txID, 15*time.Second)
_, err = waitForTransaction(t, testClient, someAddress, txID, 30*time.Second)
a.NoError(err)

account, err := testClient.AccountInformationV2(someAddress)
Expand Down