Fix flaky tests

Author: pepeiborra

hls-test-utils/src/Test/Hls.hs

@@ -19,6 +19,7 @@ module Test.Hls
     runSessionWithServerFormatter,
     runSessionWithServer',
     waitForProgressDone,
+    waitForAllProgressDone,
     PluginDescriptor,
     IdeState,
   )
@@ -195,3 +196,15 @@ waitForProgressDone = loop
         _ -> Nothing
       done <- null <$> getIncompleteProgressSessions
       unless done loop
+
+-- | Wait for all progress to be done
+-- Needs at least one progress done notification to return
+waitForAllProgressDone :: Session ()
+waitForAllProgressDone = loop
+  where
+    loop = do
+      ~() <- skipManyTill anyMessage $ satisfyMaybe $ \case
+        FromServerMess SProgress (NotificationMessage _ _ (ProgressParams _ (End _))) -> Just ()
+        _ -> Nothing
+      done <- null <$> getIncompleteProgressSessions
+      unless done loop

plugins/hls-tactics-plugin/test/Utils.hs

@@ -85,6 +85,7 @@ mkTest name fp line col ts = it name $ do
   runSessionForTactics $ do
     doc <- openDoc (fp <.> "hs") "haskell"
     _ <- waitForDiagnostics
+    waitForAllProgressDone
     actions <- getCodeActions doc $ pointRange line col
     let titles = mapMaybe codeActionTitle actions
     for_ ts $ \(f, tc, var) -> do