Merge pull request #12119 from nextcloud/backport/12115/stable29

[stable29] fix(tests): Make tests more reliable on PostgreSQL by also sorting on stop
nextcloud · Apr 15, 2024 · 071c638 · 071c638
2 parents 2b54153 + 77a0bd9
commit 071c638
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Service/BreakoutRoomService.php b/lib/Service/BreakoutRoomService.php
@@ -439,7 +439,7 @@ public function stopBreakoutRooms(Room $parent): array {
 
 		$this->roomService->setBreakoutRoomStatus($parent, BreakoutRoom::STATUS_STOPPED);
 
-		$breakoutRooms = $this->manager->getMultipleRoomsByObject(BreakoutRoom::PARENT_OBJECT_TYPE, $parent->getToken());
+		$breakoutRooms = $this->manager->getMultipleRoomsByObject(BreakoutRoom::PARENT_OBJECT_TYPE, $parent->getToken(), true);
 		foreach ($breakoutRooms as $breakoutRoom) {
 			$this->roomService->setLobby($breakoutRoom, Webinary::LOBBY_NON_MODERATORS, null);
 

diff --git a/lib/Signaling/Listener.php b/lib/Signaling/Listener.php
@@ -395,7 +395,7 @@ protected function getSessionIdsForNonModeratorsMatchingParticipant(Participant
 	}
 
 	protected function notifyBreakoutRoomStopped(Room $room): void {
-		$breakoutRooms = $this->manager->getMultipleRoomsByObject(BreakoutRoom::PARENT_OBJECT_TYPE, $room->getToken());
+		$breakoutRooms = $this->manager->getMultipleRoomsByObject(BreakoutRoom::PARENT_OBJECT_TYPE, $room->getToken(), true);
 
 		foreach ($breakoutRooms as $breakoutRoom) {
 			$sessionIds = [];