Skip to content

[SQSERVICES-1848] Flaky test team user search query with paging state #2996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
battermann merged 4 commits into from
Jan 17, 2023
Merged

[SQSERVICES-1848] Flaky test team user search query with paging state #2996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfb9e92
fall back to default search order (created_at)
battermann Jan 17, 2023
55083b4
changelog
battermann Jan 17, 2023
42ef1bf
linting
battermann Jan 17, 2023
3df96dc
make linter happy
battermann Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5-internal/sqservices-1848
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed flaky team user search integration test
2 changes: 1 addition & 1 deletion docs/convert/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> {} }:
{ pkgs ? import <nixpkgs> { } }:
(pkgs.buildFHSUserEnv {
name = "pipzone";
targetPkgs = pkgs: (with pkgs; [
Expand Down
1 change: 0 additions & 1 deletion services/brig/src/Brig/User/Search/Index.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE NumericUnderscores #-}
{-# LANGUAGE StrictData #-}

-- This file is part of the Wire Server implementation.
Expand Down
1 change: 0 additions & 1 deletion services/brig/test/integration/API/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
--
-- You should have received a copy of the GNU Affero General Public License along
-- with this program. If not, see <https://www.gnu.org/licenses/>.
{-# LANGUAGE NumericUnderscores #-}

module API.Internal
( tests,
Expand Down
2 changes: 1 addition & 1 deletion services/brig/test/integration/API/TeamUserSearch.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ testEmptyQuerySortedWithPagination :: TestConstraints m => Brig -> m ()
testEmptyQuerySortedWithPagination brig = do
(tid, userId -> ownerId, _) <- createPopulatedBindingTeamWithNamesAndHandles brig 20
refreshIndex brig
let teamUserSearch mPs = executeTeamUserSearchWithMaybeState brig tid ownerId (Just "") Nothing (Just SortByRole) (Just SortOrderAsc) (Just $ unsafeRange 10) mPs
let teamUserSearch mPs = executeTeamUserSearchWithMaybeState brig tid ownerId (Just "") Nothing Nothing Nothing (Just $ unsafeRange 10) mPs
searchResultFirst10 <- teamUserSearch Nothing
searchResultNext10 <- teamUserSearch (searchPagingState searchResultFirst10)
searchResultLast1 <- teamUserSearch (searchPagingState searchResultNext10)
Expand Down