Skip to content

tests: fix flaky TestApplicationsUpgradeOverGossip #6251

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
algorandskiy merged 3 commits into from
Feb 12, 2025
+11 −5
Merged

tests: fix flaky TestApplicationsUpgradeOverGossip #6251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0cf3cd
tests: fix flaky TestApplicationsUpgradeOverGossip
algorandskiy Feb 12, 2025
2eb7a3d
tests: store ledger files from newSimpleLedgerFull in temp dir
algorandskiy Feb 12, 2025
d8227cb
tests: add short test opt to TestCatchpointAfterStakeLookupTxns
algorandskiy Feb 12, 2025
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
6 changes: 4 additions & 2 deletions ledger/catchpointfilewriter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,8 +1144,10 @@ func TestCatchpointAfterStakeLookupTxns(t *testing.T) {
shortMax := max(config.Consensus[protocol.ConsensusFuture].MaxBalLookback, config.Consensus[protocol.ConsensusFuture].CatchpointLookback)
shortRounds := 2*shortMax + 50
longRounds := uint64(1500)
t.Run("future", func(t *testing.T) { testCatchpointAfterStakeLookupTxns(t, protocol.ConsensusFuture, longRounds, true) })
t.Run("future_noSP", func(t *testing.T) { testCatchpointAfterStakeLookupTxns(t, futureNoSP, longRounds, false) })
if !testing.Short() {
t.Run("future", func(t *testing.T) { testCatchpointAfterStakeLookupTxns(t, protocol.ConsensusFuture, longRounds, true) })
t.Run("future_noSP", func(t *testing.T) { testCatchpointAfterStakeLookupTxns(t, futureNoSP, longRounds, false) })
}
t.Run("future_short", func(t *testing.T) { testCatchpointAfterStakeLookupTxns(t, protocol.ConsensusFuture, shortRounds, true) })
t.Run("future_noSP_short", func(t *testing.T) { testCatchpointAfterStakeLookupTxns(t, futureNoSP, shortRounds, false) })
}
Expand Down
3 changes: 3 additions & 0 deletions ledger/simple_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package ledger
import (
"context"
"fmt"
"path/filepath"
"strings"
"testing"

Expand Down Expand Up @@ -74,8 +75,10 @@ func newSimpleLedgerFull(t testing.TB, balances bookkeeping.GenesisBalances, cv
require.NoError(t, err)
require.False(t, genBlock.FeeSink.IsZero())
require.False(t, genBlock.RewardsPool.IsZero())
tempDir := t.TempDir()
dbName := fmt.Sprintf("%s.%d", t.Name(), crypto.RandUint64())
dbName = strings.Replace(dbName, "/", "_", -1)
dbName = filepath.Join(tempDir, dbName)
cfg.Archival = !slCfg.notArchival
log := slCfg.logger
if log == nil {
Expand Down
7 changes: 4 additions & 3 deletions test/e2e-go/upgrades/application_support_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,10 @@ func TestApplicationsUpgradeOverGossip(t *testing.T) {
a.NoError(err)

// Fund the manager, so it can issue transactions later on
_, err = client.SendPaymentFromUnencryptedWallet(creator, user, fee, 10000000000, nil)
tx0, err := client.SendPaymentFromUnencryptedWallet(creator, user, fee, 10000000000, nil)
a.NoError(err)
client.WaitForRound(round + 2)
isCommitted := fixture.WaitForTxnConfirmation(round+10, tx0.ID().String())
a.True(isCommitted)

round, err = client.CurrentRound()
a.NoError(err)
Expand Down Expand Up @@ -454,7 +455,7 @@ int 1
// Try polling 10 rounds to ensure txn is committed.
round, err = client.CurrentRound()
a.NoError(err)
isCommitted := fixture.WaitForTxnConfirmation(round+10, txid)
isCommitted = fixture.WaitForTxnConfirmation(round+10, txid)
a.True(isCommitted)

// check creator's balance record for the app entry and the state changes
Expand Down