Skip to content

Fix flaky boot def test #2686

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
merged 6 commits into from
Feb 4, 2022
Merged

Fix flaky boot def test #2686

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f545c3b
fix flaky boot-def test
eddiemundo Feb 2, 2022
a28a44b
fix test
eddiemundo Feb 3, 2022
87d372c
refactor to use parser style
eddiemundo Feb 3, 2022
7d887ad
remove slight duplication
eddiemundo Feb 3, 2022
830ffc1
add comment to test
eddiemundo Feb 3, 2022
813dbbc
Merge branch 'master' into flaky-boot-def-test
mergify[bot] Feb 4, 2022
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
17 changes: 11 additions & 6 deletions ghcide/test/exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5553,12 +5553,17 @@ bootTests = testGroup "boot"
-- Dirty the cache
liftIO $ runInDir dir $ do
cDoc <- createDoc cPath "haskell" cSource
_ <- getHover cDoc $ Position 4 3
~() <- skipManyTill anyMessage $ satisfyMaybe $ \case
FromServerMess (SCustomMethod "ghcide/reference/ready") (NotMess NotificationMessage{_params = fp}) -> do
A.Success fp' <- pure $ fromJSON fp
if equalFilePath fp' cPath then pure () else Nothing
_ -> Nothing
let hoverParams = HoverParams cDoc (Position 4 3) Nothing
hoverRequestId <- sendRequest STextDocumentHover hoverParams
inBetweenMsgs <- manyTill anyMessage (responseForId STextDocumentHover hoverRequestId)
let isReadyMsg = \case
FromServerMess (SCustomMethod "ghcide/reference/ready") (NotMess NotificationMessage{_params = params}) ->
case fromJSON params of
A.Success fp | equalFilePath fp cPath -> Just ()
_ -> Nothing
_ -> Nothing
when (not (any (isJust . isReadyMsg) inBetweenMsgs)) $
skipManyTill anyMessage $ satisfyMaybe isReadyMsg
closeDoc cDoc
cdoc <- createDoc cPath "haskell" cSource
locs <- getDefinitions cdoc (Position 7 4)
Expand Down