From 475b74d2e6850ca2f5e5c6810aba5a4dca75ad8b Mon Sep 17 00:00:00 2001 From: Tsachi Herman Date: Wed, 15 Jan 2020 21:18:32 -0500 Subject: [PATCH] Wait test less restrictive. --- network/wsNetwork_test.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/network/wsNetwork_test.go b/network/wsNetwork_test.go index af35b450b5..b4d6780f57 100644 --- a/network/wsNetwork_test.go +++ b/network/wsNetwork_test.go @@ -54,9 +54,11 @@ func TestMain(m *testing.M) { } func debugMetrics(t *testing.T) { - var buf strings.Builder - metrics.DefaultRegistry().WriteMetrics(&buf, "") - t.Log(buf.String()) + if t.Failed() { + var buf strings.Builder + metrics.DefaultRegistry().WriteMetrics(&buf, "") + t.Log(buf.String()) + } } type emptyPhonebook struct{} @@ -472,17 +474,24 @@ func TestSlowHandlers(t *testing.T) { ipi++ } ok := false - for i := 0; i < 10; i++ { - time.Sleep(time.Millisecond) + lastnw := -1 + totalWait := 0 + for i := 0; i < 7; i++ { + waitTime := int(1 << uint64(i)) + time.Sleep(time.Duration(waitTime) * time.Millisecond) + totalWait += waitTime nw := slowCounter.numWaiters() if nw == incomingThreads { ok = true break } - t.Logf("%dms %d waiting", i+1, nw) + if lastnw != nw { + t.Logf("%dms %d waiting", totalWait, nw) + lastnw = nw + } } if !ok { - t.Errorf("timeout waiting for %d threads to block on slow handler, have %d", incomingThreads, slowCounter.numWaiters()) + t.Errorf("timeout waiting for %d threads to block on slow handler, have %d", incomingThreads, lastnw) } require.Equal(t, 0, fastCounter.Count())