From 2a95e1ab41a67ff61475509e7e0a9e1003a916d1 Mon Sep 17 00:00:00 2001 From: Romain LE JEUNE Date: Mon, 16 Oct 2023 17:48:44 +0200 Subject: [PATCH] test: Support multiple users when waiting for sync event. --- tests/bridge_test.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/bridge_test.go b/tests/bridge_test.go index bcb4a3bd..d268ec44 100644 --- a/tests/bridge_test.go +++ b/tests/bridge_test.go @@ -299,17 +299,16 @@ func (s *scenario) bridgeSendsSyncStartedAndFinishedEventsForUser(username strin break } + for { + finishEvent, ok := awaitType(s.t.events, events.SyncFinished{}, 30*time.Second) + if !ok { + return errors.New("expected sync finished event, got none") + } - finishEvent, ok := awaitType(s.t.events, events.SyncFinished{}, 30*time.Second) - if !ok { - return errors.New("expected sync finished event, got none") + if wantUserID := s.t.getUserByName(username).getUserID(); finishEvent.UserID == wantUserID { + return nil + } } - - if wantUserID := s.t.getUserByName(username).getUserID(); finishEvent.UserID != wantUserID { - return fmt.Errorf("expected sync finished event for user %s, got %s", wantUserID, finishEvent.UserID) - } - - return nil } func (s *scenario) bridgeSendsAnUpdateNotAvailableEvent() error {