Merge pull request ipfs/go-bitswap#534 from ipfs/fix/flaky-test-rate-…

…limiting-requests

Fix ProviderQueryManager test timings

This commit was moved from ipfs/go-bitswap@462f628

bitswap/internal/providerquerymanager/providerquerymanager_test.go

@@ -69,7 +69,7 @@ func TestNormalSimultaneousFetch(t *testing.T) {
  providerQueryManager.Startup()
  keys := testutil.GenerateCids(2)
 
- sessionCtx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
+ sessionCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
  defer cancel()
  firstRequestChan := providerQueryManager.FindProvidersAsync(sessionCtx, keys[0])
  secondRequestChan := providerQueryManager.FindProvidersAsync(sessionCtx, keys[1])
@@ -107,7 +107,7 @@ func TestDedupingProviderRequests(t *testing.T) {
  providerQueryManager.Startup()
  key := testutil.GenerateCids(1)[0]
 
- sessionCtx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
+ sessionCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
  defer cancel()
  firstRequestChan := providerQueryManager.FindProvidersAsync(sessionCtx, key)
  secondRequestChan := providerQueryManager.FindProvidersAsync(sessionCtx, key)
@@ -152,7 +152,7 @@ func TestCancelOneRequestDoesNotTerminateAnother(t *testing.T) {
  firstSessionCtx, firstCancel := context.WithTimeout(ctx, 3*time.Millisecond)
  defer firstCancel()
  firstRequestChan := providerQueryManager.FindProvidersAsync(firstSessionCtx, key)
- secondSessionCtx, secondCancel := context.WithTimeout(ctx, 100*time.Millisecond)
+ secondSessionCtx, secondCancel := context.WithTimeout(ctx, 5*time.Second)
  defer secondCancel()
  secondRequestChan := providerQueryManager.FindProvidersAsync(secondSessionCtx, key)
 
@@ -262,7 +262,7 @@ func TestRateLimitingRequests(t *testing.T) {
  providerQueryManager.Startup()
 
  keys := testutil.GenerateCids(maxInProcessRequests + 1)
- sessionCtx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
+ sessionCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
  defer cancel()
  var requestChannels []<-chan peer.ID
  for i := 0; i < maxInProcessRequests+1; i++ {
@@ -283,6 +283,7 @@ func TestRateLimitingRequests(t *testing.T) {
  fpn.queriesMadeMutex.Lock()
  defer fpn.queriesMadeMutex.Unlock()
  if fpn.queriesMade != maxInProcessRequests+1 {
+ t.Logf("Queries made: %d\n", fpn.queriesMade)
  t.Fatal("Did not make all seperate requests")
  }
 }
@@ -291,15 +292,15 @@ func TestFindProviderTimeout(t *testing.T) {
  peers := testutil.GeneratePeers(10)
  fpn := &fakeProviderNetwork{
  peersFound: peers,
- delay: 1 * time.Millisecond,
+ delay: 10 * time.Millisecond,
  }
  ctx := context.Background()
  providerQueryManager := New(ctx, fpn)
  providerQueryManager.Startup()
  providerQueryManager.SetFindProviderTimeout(2 * time.Millisecond)
  keys := testutil.GenerateCids(1)
 
- sessionCtx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
+ sessionCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
  defer cancel()
  firstRequestChan := providerQueryManager.FindProvidersAsync(sessionCtx, keys[0])
  var firstPeersReceived []peer.ID