Unexpected behavior for WaitLog.WithOccurence

[FlorianLehmann]

Describe the bug
When I define

NewLogStrategy("").
WithStartupTimeout(100 * time.Microsecond).
WithOccurrence(X)

for a container, it does not wait for X occurences. One occurence is enough to continue.

To Reproduce
func TestWaitShouldFailWithExactNumberOfOccurrences(t *testing.T) { target := noopStrategyTarget{ ioReaderCloser: ioutil.NopCloser(bytes.NewReader([]byte("hello\r\ndude"))), } wg := NewLogStrategy("dude"). WithStartupTimeout(100 * time.Microsecond). WithOccurrence(2) err := wg.WaitUntilReady(context.Background(), target) if err == nil { t.Fatal("expected error") } }

Expected behavior
it must wait for X occurences in the logs.

Additional context

testcontainers-go/wait/log.go

Lines 75 to 95 in 6467d9b

	currentOccurence := 0
	LOOP:
	for {
	select {
	case <-ctx.Done():
	return ctx.Err()
	default:
	reader, err := target.Logs(ctx)
	if err != nil {
	time.Sleep(ws.PollInterval)
	continue
	}
	b, err := ioutil.ReadAll(reader)
	logs := string(b)
	if strings.Contains(logs, ws.Log) {
	currentOccurence++
	if ws.Occurrence == 0 || currentOccurence >= ws.Occurrence-1 {
	break LOOP
	}

There is a variable currentOccurence defined before the loop. This variable is incremented in the loop each time the expected log appears. However, logs are read from the beginning. Therefore, the condition based on the number of occurences is always true if the expected log is present only once.

[mdelapenya]

@FlorianLehmann should we close this issue? I see the PR was merged

Thanks!!

[FlorianLehmann]

Yes, this has been resolved. It can be closed. Thanks