fix hiedbretry ghcide tests

Author: eddiemundo

ghcide/test/exe/HieDbRetry.hs

@@ -10,19 +10,27 @@ import           Data.Tuple.Extra             (dupe)
 import qualified Database.SQLite.Simple       as SQLite
 import           Development.IDE.Session      (retryOnException,
                                                retryOnSqliteBusy)
-import           Development.IDE.Types.Logger (Logger (Logger), Priority,
-                                               noLogging)
+-- import           Development.IDE.Types.Logger (Logger (Logger), Priority,
+--                                                noLogging)
+import           Control.Monad.IO.Class       (MonadIO (liftIO))
+import           Development.IDE.Types.Logger (LogMessage (LogOther),
+                                               LogOtherMessage (LogOtherMessage, payload, priority),
+                                               Priority,
+                                               Recorder (Recorder, logger, tracer),
+                                               noopRecorder)
 import qualified System.Random                as Random
 import           Test.Tasty                   (TestTree, testGroup)
 import           Test.Tasty.HUnit             (assertFailure, testCase, (@?=))
 
-makeLogger :: Var [(Priority, Text)] -> Logger
-makeLogger msgsVar = Logger $ \priority msg -> modifyVar msgsVar (\msgs -> pure ((priority, msg) : msgs, ()))
+makeLogger :: Var [(Priority, Text)] -> Recorder LogMessage
+makeLogger msgsVar = Recorder{ logger = logger, tracer = undefined }
+  where
+    logger (LogOther LogOtherMessage{priority, payload}) = liftIO $ modifyVar msgsVar (\msgs -> pure ((priority, payload) : msgs, ()))
 
 rng :: Random.StdGen
 rng = Random.mkStdGen 0
 
-retryOnSqliteBusyForTest :: Logger -> Int -> IO a -> IO a
+retryOnSqliteBusyForTest :: Recorder LogMessage -> Int -> IO a -> IO a
 retryOnSqliteBusyForTest logger maxRetryCount = retryOnException isErrorBusy logger 1 1 maxRetryCount rng
 
 isErrorBusy :: SQLite.SQLError -> Maybe SQLite.SQLError
@@ -60,7 +68,7 @@ tests = testGroup "RetryHieDb"
       let expected = 1 :: Int
       let maxRetryCount = 0
 
-      actual <- retryOnSqliteBusyForTest noLogging maxRetryCount (pure expected)
+      actual <- retryOnSqliteBusyForTest noopRecorder maxRetryCount (pure expected)
 
       actual @?= expected
 
@@ -69,7 +77,7 @@ tests = testGroup "RetryHieDb"
       let maxRetryCount = 3
       let incrementThenThrow = modifyVar countVar (\count -> pure (dupe (count + 1))) >> throwIO errorBusy
 
-      _ <- tryJust isErrorBusy (retryOnSqliteBusyForTest noLogging maxRetryCount incrementThenThrow)
+      _ <- tryJust isErrorBusy (retryOnSqliteBusyForTest noopRecorder maxRetryCount incrementThenThrow)
 
       withVar countVar $ \count ->
         count @?= maxRetryCount + 1
@@ -86,7 +94,7 @@ tests = testGroup "RetryHieDb"
               modifyVar countVar (\count -> pure (dupe (count + 1)))
 
 
-      _ <- tryJust isErrorCall (retryOnSqliteBusyForTest noLogging maxRetryCount throwThenIncrement)
+      _ <- tryJust isErrorCall (retryOnSqliteBusyForTest noopRecorder maxRetryCount throwThenIncrement)
 
       withVar countVar $ \count ->
         count @?= 0
@@ -101,7 +109,7 @@ tests = testGroup "RetryHieDb"
             else
               modifyVar countVar (\count -> pure (dupe (count + 1)))
 
-      _ <- retryOnSqliteBusy noLogging rng incrementThenThrowThenIncrement
+      _ <- retryOnSqliteBusy noopRecorder rng incrementThenThrowThenIncrement
 
       withVar countVar $ \count ->
         count @?= 2