From 373033e7540d67c455587e61826d5a1c524f291a Mon Sep 17 00:00:00 2001 From: Dirk McCormick Date: Fri, 1 May 2020 12:05:37 -0400 Subject: [PATCH] test: fix flaky test TestSessionBetweenPeers --- bitswap_with_sessions_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bitswap_with_sessions_test.go b/bitswap_with_sessions_test.go index 9551938..f710879 100644 --- a/bitswap_with_sessions_test.go +++ b/bitswap_with_sessions_test.go @@ -9,10 +9,12 @@ import ( bitswap "github.com/ipfs/go-bitswap" bssession "github.com/ipfs/go-bitswap/internal/session" testinstance "github.com/ipfs/go-bitswap/testinstance" + tn "github.com/ipfs/go-bitswap/testnet" blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" blocksutil "github.com/ipfs/go-ipfs-blocksutil" delay "github.com/ipfs/go-ipfs-delay" + mockrouting "github.com/ipfs/go-ipfs-routing/mock" tu "github.com/libp2p/go-libp2p-testing/etc" ) @@ -71,7 +73,7 @@ func TestSessionBetweenPeers(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - vnet := getVirtualNetwork() + vnet := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(time.Millisecond)) ig := testinstance.NewTestInstanceGenerator(vnet, nil, nil) defer ig.Close() bgen := blocksutil.NewBlockGenerator() @@ -112,6 +114,10 @@ func TestSessionBetweenPeers(t *testing.T) { t.Fatal(err) } } + + // Uninvolved nodes should receive + // - initial broadcast want-have of root block + // - CANCEL (when Peer A receives the root block from Peer B) for _, is := range inst[2:] { stat, err := is.Exchange.Stat() if err != nil { -- GitLab