Skip to content

ethclient, accounts/keystore: fix flaky tests #23599

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
holiman merged 2 commits into from
Sep 20, 2021
Merged

ethclient, accounts/keystore: fix flaky tests #23599

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
dbf4944
ethclient/gethclient: fix flaky test (due to map key ordering)
holiman Sep 18, 2021
1ecf179
accounts/keystore: fix test failing due to rand collision due to low …
holiman Sep 18, 2021
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
4 changes: 2 additions & 2 deletions accounts/keystore/account_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func TestWatchNoDir(t *testing.T) {

// Create ks but not the directory that it watches.
rand.Seed(time.Now().UnixNano())
dir := filepath.Join(os.TempDir(), fmt.Sprintf("eth-keystore-watch-test-%d-%d", os.Getpid(), rand.Int()))
dir := filepath.Join(os.TempDir(), fmt.Sprintf("eth-keystore-watchnodir-test-%d-%d", os.Getpid(), rand.Int()))
ks := NewKeyStore(dir, LightScryptN, LightScryptP)

list := ks.Accounts()
Expand Down Expand Up @@ -322,7 +322,7 @@ func TestUpdatedKeyfileContents(t *testing.T) {

// Create a temporary kesytore to test with
rand.Seed(time.Now().UnixNano())
dir := filepath.Join(os.TempDir(), fmt.Sprintf("eth-keystore-watch-test-%d-%d", os.Getpid(), rand.Int()))
dir := filepath.Join(os.TempDir(), fmt.Sprintf("eth-keystore-updatedkeyfilecontents-test-%d-%d", os.Getpid(), rand.Int()))
ks := NewKeyStore(dir, LightScryptN, LightScryptP)

list := ks.Accounts()
Expand Down
37 changes: 20 additions & 17 deletions ethclient/gethclient/gethclient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,37 +97,40 @@ func TestGethClient(t *testing.T) {
defer backend.Close()
defer client.Close()

tests := map[string]struct {
tests := []struct {
name string
test func(t *testing.T)
}{
"TestAccessList": {
{
"TestAccessList",
func(t *testing.T) { testAccessList(t, client) },
},
"TestGetProof": {
{
"TestGetProof",
func(t *testing.T) { testGetProof(t, client) },
},
"TestGCStats": {
}, {
"TestGCStats",
func(t *testing.T) { testGCStats(t, client) },
},
"TestMemStats": {
}, {
"TestMemStats",
func(t *testing.T) { testMemStats(t, client) },
},
"TestGetNodeInfo": {
}, {
"TestGetNodeInfo",
func(t *testing.T) { testGetNodeInfo(t, client) },
},
"TestSetHead": {
}, {
"TestSetHead",
func(t *testing.T) { testSetHead(t, client) },
},
"TestSubscribePendingTxs": {
}, {
"TestSubscribePendingTxs",
func(t *testing.T) { testSubscribePendingTransactions(t, client) },
},
"TestCallContract": {
}, {
"TestCallContract",
func(t *testing.T) { testCallContract(t, client) },
},
}
t.Parallel()
for name, tt := range tests {
t.Run(name, tt.test)
for _, tt := range tests {
t.Run(tt.name, tt.test)
}
}

Expand Down