Skip to content

Commit a677255

Browse files
authored
[chore] Fix WaitFor... test helpers (#1735)
1 parent 0180b91 commit a677255

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

functional_tests/internal/common.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ import (
2525
"github.com/stretchr/testify/require"
2626
)
2727

28-
const Namespace = "default"
28+
const (
29+
Namespace = "default"
30+
waitTimeout = 3 * time.Minute
31+
)
2932

3033
func HostEndpoint(t *testing.T) string {
3134
if host, ok := os.LookupEnv("HOST_ENDPOINT"); ok {
@@ -52,30 +55,27 @@ func HostEndpoint(t *testing.T) string {
5255
}
5356

5457
func WaitForTraces(t *testing.T, entriesNum int, tc *consumertest.TracesSink) {
55-
timeoutMinutes := 3
5658
require.Eventuallyf(t, func() bool {
57-
return len(tc.AllTraces()) > entriesNum
58-
}, time.Duration(timeoutMinutes)*time.Minute, 1*time.Second,
59-
"failed to receive %d entries, received %d traces in %d minutes", entriesNum,
60-
len(tc.AllTraces()), timeoutMinutes)
59+
return len(tc.AllTraces()) >= entriesNum
60+
}, waitTimeout, 1*time.Second,
61+
"failed to receive %d entries, received %d traces in %f minutes", entriesNum,
62+
len(tc.AllTraces()), waitTimeout.Minutes())
6163
}
6264

6365
func WaitForLogs(t *testing.T, entriesNum int, lc *consumertest.LogsSink) {
64-
timeoutMinutes := 3
6566
require.Eventuallyf(t, func() bool {
66-
return len(lc.AllLogs()) > entriesNum
67-
}, time.Duration(timeoutMinutes)*time.Minute, 1*time.Second,
68-
"failed to receive %d entries, received %d logs in %d minutes", entriesNum,
69-
len(lc.AllLogs()), timeoutMinutes)
67+
return len(lc.AllLogs()) >= entriesNum
68+
}, waitTimeout, 1*time.Second,
69+
"failed to receive %d entries, received %d logs in %f minutes", entriesNum,
70+
len(lc.AllLogs()), waitTimeout.Minutes())
7071
}
7172

7273
func WaitForMetrics(t *testing.T, entriesNum int, mc *consumertest.MetricsSink) {
73-
timeoutMinutes := 3
7474
require.Eventuallyf(t, func() bool {
75-
return len(mc.AllMetrics()) > entriesNum
76-
}, time.Duration(timeoutMinutes)*time.Minute, 1*time.Second,
77-
"failed to receive %d entries, received %d metrics in %d minutes", entriesNum,
78-
len(mc.AllMetrics()), timeoutMinutes)
75+
return len(mc.AllMetrics()) >= entriesNum
76+
}, waitTimeout, 1*time.Second,
77+
"failed to receive %d entries, received %d metrics in %f minutes", entriesNum,
78+
len(mc.AllMetrics()), waitTimeout.Minutes())
7979
}
8080

8181
func CheckNoEventsReceived(t *testing.T, lc *consumertest.LogsSink) {

0 commit comments

Comments
 (0)