Skip to content

fix: flaky TestSearchValue (dual) #1038

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
guillaumemichel merged 4 commits into from
Feb 20, 2025
Merged

fix: flaky TestSearchValue (dual) #1038

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
7a61842
add verbose to flaky TestSearchValue (dual)
guillaumemichel Feb 20, 2025
4e49208
Merge branch 'master' into fix/723
guillaumemichel Feb 20, 2025
c510761
fix: flaky TestSearchValue (dual)
guillaumemichel Feb 20, 2025
8f08c08
reduce verbosity in TestRefresh
guillaumemichel Feb 20, 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
5 changes: 0 additions & 5 deletions dht_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,11 +853,6 @@ func TestRefresh(t *testing.T) {

time.Sleep(time.Microsecond * 50)
}

if testing.Verbose() {
// the routing tables should be full now. let's inspect them.
printRoutingTables(dhts)
}
}

func TestRefreshBelowMinRTThreshold(t *testing.T) {
Expand Down
14 changes: 11 additions & 3 deletions dual/dual_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
dht "github.com/libp2p/go-libp2p-kad-dht"
"github.com/libp2p/go-libp2p-kad-dht/internal"
test "github.com/libp2p/go-libp2p-kad-dht/internal/testing"
kb "github.com/libp2p/go-libp2p-kbucket"
record "github.com/libp2p/go-libp2p-record"
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/peer"
Expand Down Expand Up @@ -119,7 +120,7 @@ func connect(ctx context.Context, t *testing.T, a, b *dht.IpfsDHT) {
if len(baddr) == 0 {
t.Fatal("no addresses for connection.")
}
a.Host().Peerstore().AddAddrs(bid, baddr, peerstore.TempAddrTTL)
a.Host().Peerstore().AddAddrs(bid, baddr, peerstore.AddressTTL)
if err := a.Host().Connect(ctx, peer.AddrInfo{ID: bid}); err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -179,6 +180,7 @@ func setupTier(ctx context.Context, t *testing.T) (*DHT, *dht.IpfsDHT, *dht.Ipfs
}
hlprs[1].allow = lan.PeerID()
connect(ctx, t, d.LAN, lan)
connect(ctx, t, lan, d.LAN)

return d, wan, lan
}
Expand Down Expand Up @@ -285,7 +287,13 @@ func TestSearchValue(t *testing.T) {
d.WAN.Validator.(record.NamespacedValidator)["v"] = test.TestValidator{}
d.LAN.Validator.(record.NamespacedValidator)["v"] = test.TestValidator{}

_ = wan.PutValue(ctx, "/v/hello", []byte("valid"))
err := wan.PutValue(ctx, "/v/hello", []byte("valid"))
// it is expected that we get an ErrLookupFailure here, because wan doesn't
// have any peers in its routing table (d.WAN is a client). this operation
// still puts the record in wan local datastore, which is what we want.
if err != kb.ErrLookupFailure {
t.Error("error putting value to wan DHT:", err)
}

valCh, err := d.SearchValue(ctx, "/v/hello", dht.Quorum(0))
if err != nil {
Expand All @@ -312,7 +320,7 @@ func TestSearchValue(t *testing.T) {

err = lan.PutValue(ctx, "/v/hello", []byte("newer"))
if err != nil {
t.Error(err)
t.Error("error putting value to lan DHT:", err)
}

valCh, err = d.SearchValue(ctx, "/v/hello", dht.Quorum(0))
Expand Down