diff --git a/test/testutil/readiness.go b/test/testutil/readiness.go index e20e8ea5..fe7552b9 100644 --- a/test/testutil/readiness.go +++ b/test/testutil/readiness.go @@ -7,6 +7,8 @@ import ( "net" "testing" "time" + + "github.com/stretchr/testify/require" ) const ( @@ -17,17 +19,14 @@ const ( // WaitForTCP waits until a TCP connection can be established. func WaitForTCP(t *testing.T, addr string) { t.Helper() - deadline := time.Now().Add(defaultReadinessTimeout) - - for time.Now().Before(deadline) { + require.Eventuallyf(t, func() bool { conn, err := net.DialTimeout("tcp", addr, defaultReadinessInterval) if err == nil { conn.Close() - return + return true } - time.Sleep(defaultReadinessInterval) - } - t.Fatalf("timeout waiting for TCP readiness at %s", addr) + return false + }, defaultReadinessTimeout, defaultReadinessInterval, "timeout waiting for TCP readiness at %s", addr) } // WaitForSpanFlush waits for spans to be flushed to collector.