tmp test macOS 4, fixed 2

IntersectMBO · Jan 17, 2022 · 69b4a9f · 69b4a9f
1 parent c25c929
commit 69b4a9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cardano-tracer/test/Cardano/Tracer/Test/Logs/Tests.hs b/cardano-tracer/test/Cardano/Tracer/Test/Logs/Tests.hs
@@ -27,7 +27,7 @@ import           Cardano.Tracer.Test.Utils
 tests :: TestTree
 tests = localOption (QuickCheckTests 1) $ testGroup "Test.Logs"
   [ testProperty ".log"             $ propRunInLogsStructure  (propLogs ForHuman)
-  --, testProperty ".json"            $ propRunInLogsStructure  (propLogs ForMachine)
+  , testProperty ".json"            $ propRunInLogsStructure  (propLogs ForMachine)
   --, testProperty "multi, initiator" $ propRunInLogsStructure2 (propMultiInit ForMachine)
   --, testProperty "multi, responder" $ propRunInLogsStructure  (propMultiResp ForMachine)
   ]

diff --git a/cardano-tracer/test/Cardano/Tracer/Test/Utils.hs b/cardano-tracer/test/Cardano/Tracer/Test/Utils.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE MultiWayIf #-}
-
 module Cardano.Tracer.Test.Utils
   ( doesDirectoryEmpty
   , false
@@ -48,10 +46,12 @@ prepareLocalSock :: FilePath -> FilePath
 prepareLocalSock localSock =
   if isWindows
     then pipeForWindows
-    else if isMac then sockForMac else localSock
+    else if isMac
+           then sockForMac
+           else localSock
  where
   pipeForWindows = "\\\\.\\pipe\\" <> dropDrive localSock
-  sockForMac = "/tmp/cardano-tracer-test"
+  sockForMac = "/tmp/cardano-tracer-test.pipe"
 
 removeDirectoryContent :: FilePath -> IO ()
 removeDirectoryContent dir = listDirectories dir >>= mapM_ removePathForcibly