diff options
| -rw-r--r-- | util/eventbus/eventbustest/eventbustest.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/util/eventbus/eventbustest/eventbustest.go b/util/eventbus/eventbustest/eventbustest.go index b3ef6c884..62fee1041 100644 --- a/util/eventbus/eventbustest/eventbustest.go +++ b/util/eventbus/eventbustest/eventbustest.go @@ -119,14 +119,6 @@ func Expect(tw *Watcher, filters ...any) error { // you are testing for the absence of events, call [synctest.Wait] after // actions that would publish an event, but before calling ExpectExactly. func ExpectExactly(tw *Watcher, filters ...any) error { - if len(filters) == 0 { - select { - case event := <-tw.events: - return fmt.Errorf("saw event type %s, expected none", reflect.TypeOf(event)) - case <-time.After(100 * time.Second): // "indefinitely", to advance a synctest clock - return nil - } - } eventCount := 0 for pos, next := range filters { eventFunc := eventFilter(next) @@ -154,6 +146,12 @@ func ExpectExactly(tw *Watcher, filters ...any) error { return errors.New("watcher closed while waiting for events") } } + select { + case event := <-tw.events: + return fmt.Errorf("saw event type %s at index %d, expected none", reflect.TypeOf(event), eventCount) + case <-time.After(100 * time.Second): // "indefinitely", to advance a synctest clock + return nil + } return nil } |