Skip to content
This repository has been archived by the owner on Aug 19, 2022. It is now read-only.

Fix test flakes #164

Merged
merged 4 commits into from
Jul 21, 2021
Merged

Fix test flakes #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a4c488
fix: assert that peer record is accepted in test
Stebalien Jul 20, 2021
7afb11e
test: don't run datastore tests in parallel
Stebalien Jul 21, 2021
59822c4
test: make the "add" test less timing dependent
Stebalien Jul 21, 2021
d5e4862
fix: avoid using the disk in datastore tests
Stebalien Jul 21, 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
12 changes: 2 additions & 10 deletions pstoreds/ds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ func TestDsPeerstore(t *testing.T) {
func TestDsAddrBook(t *testing.T) {
for name, dsFactory := range dstores {
t.Run(name+" Cacheful", func(t *testing.T) {
t.Parallel()

opts := DefaultOpts()
opts.GCPurgeInterval = 1 * time.Second
opts.CacheSize = 1024
Expand All @@ -43,8 +41,6 @@ func TestDsAddrBook(t *testing.T) {
})

t.Run(name+" Cacheless", func(t *testing.T) {
t.Parallel()

opts := DefaultOpts()
opts.GCPurgeInterval = 1 * time.Second
opts.CacheSize = 0
Expand Down Expand Up @@ -106,17 +102,13 @@ func badgerStore(tb testing.TB) (ds.Batching, func()) {
}

func leveldbStore(tb testing.TB) (ds.Batching, func()) {
dataPath, err := ioutil.TempDir(os.TempDir(), "leveldb")
if err != nil {
tb.Fatal(err)
}
store, err := leveldb.NewDatastore(dataPath, nil)
// Intentionally test in-memory because disks suck, especially in CI.
store, err := leveldb.NewDatastore("", nil)
if err != nil {
tb.Fatal(err)
}
closer := func() {
store.Close()
os.RemoveAll(dataPath)
}
return store, closer
}
Expand Down
14 changes: 10 additions & 4 deletions test/addr_book_suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ func testAddAddress(ab pstore.AddrBook) func(*testing.T) {

ab.AddAddrs(id, addrs, 4*time.Second)
// 4 seconds left
time.Sleep(3 * time.Second)
// 1 second left
time.Sleep(2 * time.Second)
// 2 second left
ab.AddAddrs(id, addrs, 3*time.Second)
// 3 seconds left
time.Sleep(1 * time.Second)
Expand Down Expand Up @@ -457,8 +457,11 @@ func testCertifiedAddresses(m pstore.AddrBook) func(*testing.T) {
rec4.Addrs = certifiedAddrs
signedRec4, err := record.Seal(rec4, priv)
test.AssertNilError(t, err)
_, err = cab.ConsumePeerRecord(signedRec4, time.Hour)
accepted, err = cab.ConsumePeerRecord(signedRec4, time.Hour)
test.AssertNilError(t, err)
if !accepted {
t.Error("expected peer record to be accepted")
}
// AssertAddressesEqual(t, certifiedAddrs, m.Addrs(id))
AssertAddressesEqual(t, allAddrs, m.Addrs(id))

Expand All @@ -475,7 +478,10 @@ func testCertifiedAddresses(m pstore.AddrBook) func(*testing.T) {
}

// Test that natural TTL expiration clears signed peer records
_, err = cab.ConsumePeerRecord(signedRec4, time.Second)
accepted, err = cab.ConsumePeerRecord(signedRec4, time.Second)
if !accepted {
t.Error("expected peer record to be accepted")
}
test.AssertNilError(t, err)
AssertAddressesEqual(t, certifiedAddrs, m.Addrs(id))

Expand Down