Skip to content

Commit

Permalink
Merge pull request #12115 from nextcloud/bugfix/noid/make-tests-more-…
Browse files Browse the repository at this point in the history
…reliable-on-postgres

fix(tests): Make tests more reliable on PostgreSQL by also sorting on stop
  • Loading branch information
nickvergessen authored Apr 15, 2024
2 parents bef88b1 + ae698a5 commit be3722f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/Service/BreakoutRoomService.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion lib/Signaling/Listener.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Expand Down

0 comments on commit be3722f

Please sign in to comment.