Add defaultTestArtifactsDirectory which works on Windows noci

codedownio · Nov 19, 2023 · ef3f772 · ef3f772
1 parent 825b070
commit ef3f772
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 46 deletions.
diff --git a/demos/demo-command-line-args/app/Main.hs b/demos/demo-command-line-args/app/Main.hs
@@ -5,7 +5,6 @@
 module Main where
 
 import Data.String.Interpolate
-import Data.Time.Clock
 import Options.Applicative
 import Test.Sandwich
 
@@ -30,5 +29,5 @@ main :: IO ()
 main = runSandwichWithCommandLineArgs' testOptions myArgsParser commandLineArgsDemo
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
diff --git a/demos/demo-context-dependencies/app/Main.hs b/demos/demo-context-dependencies/app/Main.hs
@@ -9,7 +9,6 @@ import Common
 import Control.Exception.Lifted
 import Control.Monad
 import Data.String.Interpolate
-import Data.Time.Clock
 import Test.Sandwich
 
 data DatabaseContext = MySQLDatabaseContext | SqliteDatabaseContext
@@ -46,7 +45,7 @@ databaseTest2 = do
   it "uses the database 2" $ getContext database >>= \db -> info [i|Got database: '#{db}'|]
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-context-nested-dependencies/app/Main.hs b/demos/demo-context-nested-dependencies/app/Main.hs
@@ -10,7 +10,6 @@ import Common
 import Control.Exception.Lifted
 import Control.Monad
 import Data.String.Interpolate
-import Data.Time.Clock
 import Test.Sandwich
 
 -- For the commented type signature
@@ -56,7 +55,7 @@ contextNestedDepsDemo = describe "Nested dependencies" $ do
         debug [i|Got server: #{s}|]
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-contexts/app/Main.hs b/demos/demo-contexts/app/Main.hs
@@ -7,7 +7,6 @@ import Common
 import Control.Exception.Lifted
 import Control.Monad
 import Data.String.Interpolate
-import Data.Time.Clock
 import Test.Sandwich
 
 data DatabaseContext = MySQLDatabaseContext | SqliteDatabaseContext
@@ -28,7 +27,7 @@ contextsDemo = describe "Contexts" $ do
       info [i|Got database: '#{db}'|]
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-custom-exceptions/app/Main.hs b/demos/demo-custom-exceptions/app/Main.hs
@@ -10,7 +10,6 @@ import Brick
 import Control.Exception
 import Control.Monad.IO.Class
 import Data.Text as T
-import Data.Time.Clock
 import GHC.Stack
 import Graphics.Vty.Attributes
 import Test.Sandwich
@@ -47,7 +46,7 @@ formatMyColoredException e = case fromException e of
   Nothing -> Nothing
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   , optionsFormatters = [SomeFormatter $ defaultTerminalUIFormatter {
       terminalUICustomExceptionFormatters = [formatMyException, formatMyColoredException]
       }]

diff --git a/demos/demo-discover/app/Main.hs b/demos/demo-discover/app/Main.hs
@@ -3,7 +3,6 @@
 
 module Main (Main.main) where
 
-import Data.Time.Clock
 import Test.Sandwich
 
 import qualified SeleniumTests
@@ -16,7 +15,7 @@ discoverDemo = describe "Discover" $ do
   SeleniumTests.tests
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-hedgehog/app/Main.hs b/demos/demo-hedgehog/app/Main.hs
@@ -6,7 +6,6 @@ module Main where
 
 import Control.Monad.IO.Class
 import Data.String.Interpolate
-import Data.Time.Clock
 import Hedgehog
 import qualified Hedgehog.Gen as Gen
 import qualified Hedgehog.Range as Range
@@ -25,7 +24,7 @@ quickCheckDemo = describe "Hedgehog tests" $ introduceHedgehog $ do
     reverse xs === xs
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-landing/app/Main.hs b/demos/demo-landing/app/Main.hs
@@ -7,7 +7,6 @@ module Main where
 import Common
 import Control.Concurrent
 import Control.Monad.IO.Class
-import Data.Time.Clock
 import System.Random
 import Test.Sandwich
 
@@ -54,7 +53,7 @@ sleepRandom = liftIO $ do
   threadDelay timeToSleep
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   , optionsProjectRoot = Just "demos/demo-landing"
   }
 

diff --git a/demos/demo-paralleln/app/Main.hs b/demos/demo-paralleln/app/Main.hs
@@ -7,7 +7,6 @@ module Main where
 import Common
 import Control.Concurrent
 import Control.Monad.IO.Class
-import Data.Time.Clock
 import System.Random
 import Test.Sandwich
 
@@ -37,7 +36,7 @@ sleepRandom = liftIO $ do
   threadDelay timeToSleep
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-quickcheck/app/Main.hs b/demos/demo-quickcheck/app/Main.hs
@@ -6,7 +6,6 @@ module Main where
 
 import Control.Monad.IO.Class
 import Data.String.Interpolate
-import Data.Time.Clock
 import Test.QuickCheck
 import Test.Sandwich
 import Test.Sandwich.QuickCheck
@@ -18,7 +17,7 @@ quickCheckDemo = describe "QuickCheck tests" $ introduceQuickCheck $ do
   prop "Failing list reversal" $ \(xs :: [Int]) -> (reverse xs) == xs
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-slack/app/Main.hs b/demos/demo-slack/app/Main.hs
@@ -7,7 +7,6 @@ module Main where
 import Common
 import Control.Concurrent
 import Control.Monad.IO.Class
-import Data.Time.Clock
 import System.Random
 import Test.Sandwich
 import Test.Sandwich.Formatters.Slack
@@ -55,7 +54,7 @@ sleepRandom = liftIO $ do
   threadDelay timeToSleep
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   , optionsProjectRoot = Just "sandwich-demos"
   , optionsFormatters = [SomeFormatter $ defaultSlackFormatter {
       slackFormatterSlackConfig = SlackConfig ""

diff --git a/demos/demo-timing-parallel/app/Main.hs b/demos/demo-timing-parallel/app/Main.hs
@@ -26,7 +26,7 @@ timingParallelDemo = parallel $ do
       pauseSeconds 0.3
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-timing/app/Main.hs b/demos/demo-timing/app/Main.hs
@@ -5,7 +5,6 @@
 module Main where
 
 import Common
-import Data.Time.Clock
 import Test.Sandwich
 
 timingDemo :: TopSpec
@@ -21,7 +20,7 @@ timingDemo = describe "Dinner tests" $ do
     pauseSeconds 1
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-tui/app/Main.hs b/demos/demo-tui/app/Main.hs
@@ -10,12 +10,12 @@ import Control.Concurrent
 import Control.Monad.IO.Class
 import Data.Maybe
 import Data.String.Interpolate
-import Data.Time.Clock
 import System.Random
 import Test.Sandwich
 import Test.Sandwich.Formatters.Print
 import Test.Sandwich.Formatters.TerminalUI
 
+
 simple :: TopSpec
 simple = parallel $ do
   describe "Foo" $ do
@@ -30,7 +30,7 @@ simple = parallel $ do
     it "tests bar #2" $ pauseRandomAndSucceed
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-webdriver-landing/app/Main.hs b/demos/demo-webdriver-landing/app/Main.hs
@@ -8,7 +8,6 @@ module Main where
 import Control.Concurrent
 import Control.Monad.IO.Class
 import Data.String.Interpolate
-import Data.Time.Clock
 import System.FilePath
 import Test.Sandwich
 import Test.Sandwich.WebDriver
@@ -32,7 +31,7 @@ simple = introduceWebDriverOptions @() (defaultWdOptions "/tmp/tools") $ do
       liftIO $ threadDelay 2000000
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-webdriver-pool/app/Main.hs b/demos/demo-webdriver-pool/app/Main.hs
@@ -16,7 +16,6 @@ import Control.Monad.IO.Unlift
 import Data.Maybe
 import Data.Pool
 import Data.String.Interpolate
-import Data.Time.Clock
 import System.FilePath
 import Test.Sandwich
 import Test.Sandwich.WebDriver
@@ -70,7 +69,7 @@ tests =
         claimWebdriver $ it "opens Google" $ withSession1 $ openPage "http://www.google.com"
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-webdriver-positioning/app/Main.hs b/demos/demo-webdriver-positioning/app/Main.hs
@@ -5,7 +5,6 @@ module Main where
 
 import Control.Concurrent
 import Control.Monad.IO.Class
-import Data.Time.Clock
 import Test.Sandwich
 import Test.Sandwich.WebDriver
 import Test.Sandwich.WebDriver.Windows
@@ -27,7 +26,7 @@ positioning = introduceWebDriver (defaultWdOptions "/tmp/tools") $ do
       liftIO $ threadDelay 5000000
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-webdriver-video/app/Main.hs b/demos/demo-webdriver-video/app/Main.hs
@@ -31,7 +31,7 @@ manualVideo = introduceWebDriver (defaultWdOptions "/tmp/tools") $ do
         findElem (ByCSS [i|input[type="submit"]|]) >>= click
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/demos/demo-webdriver/app/Main.hs b/demos/demo-webdriver/app/Main.hs
@@ -9,7 +9,6 @@ import Control.Concurrent
 import Control.Monad.IO.Class
 import qualified Data.ByteString.Lazy as BL
 import Data.String.Interpolate
-import Data.Time.Clock
 import System.FilePath
 import Test.Sandwich
 import Test.Sandwich.WebDriver
@@ -31,7 +30,7 @@ simple = introduceWebDriverOptions @() (defaultWdOptions "/tmp/tools") $ do
     liftIO $ threadDelay 3000000
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   }
 
 main :: IO ()

diff --git a/sandwich-hedgehog/test/Spec.hs b/sandwich-hedgehog/test/Spec.hs
@@ -12,5 +12,5 @@ main :: IO ()
 main = runSandwich options verySimple
   where
     options = defaultOptions {
-      optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+      optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
       }
diff --git a/sandwich-quickcheck/test/Spec.hs b/sandwich-quickcheck/test/Spec.hs
@@ -1,6 +1,5 @@
 
 import Test.Sandwich
-import Data.Time.Clock
 import Test.Sandwich.Formatters.Print
 
 
@@ -12,5 +11,5 @@ main :: IO ()
 main = runSandwich options verySimple
   where
     options = defaultOptions {
-      optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+      optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
       }
diff --git a/sandwich-slack/app/Main.hs b/sandwich-slack/app/Main.hs
@@ -5,7 +5,6 @@ module Main where
 
 import Control.Concurrent
 import Control.Monad.IO.Class
-import Data.Time
 import GHC.Stack
 import Test.Sandwich
 import Test.Sandwich.Formatters.Print
@@ -43,7 +42,7 @@ main :: IO ()
 main = runSandwich options simple
   where
     options = defaultOptions {
-      optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+      optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
       , optionsFormatters = [SomeFormatter defaultTerminalUIFormatter, SomeFormatter slackFormatter]
       }
 

diff --git a/sandwich-webdriver/app/Main.hs b/sandwich-webdriver/app/Main.hs
@@ -8,7 +8,6 @@ import Control.Concurrent
 import Control.Monad.IO.Class
 import Data.Maybe
 import Data.String.Interpolate
-import Data.Time.Clock
 import Test.Sandwich
 import Test.Sandwich.Formatters.Print
 import Test.Sandwich.WebDriver
@@ -91,7 +90,7 @@ wdOptions = (defaultWdOptions "/tmp/tools") {
   }
 
 testOptions = defaultOptions {
-  optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+  optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
   -- , optionsFormatters = [SomeFormatter defaultTerminalUIFormatter]
   , optionsFormatters = [SomeFormatter defaultPrintFormatter]
   }

diff --git a/sandwich-webdriver/test/Spec.hs b/sandwich-webdriver/test/Spec.hs
@@ -26,5 +26,5 @@ main :: IO ()
 main = runSandwich options spec
   where
     options = defaultOptions {
-      optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+      optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
       }
diff --git a/sandwich/app/Main.hs b/sandwich/app/Main.hs
@@ -10,7 +10,6 @@ import Control.Monad
 import Control.Monad.IO.Class
 import Control.Monad.Logger (LogLevel(..))
 import Data.String.Interpolate
-import Data.Time.Clock
 import Test.Sandwich
 import Test.Sandwich.Formatters.FailureReport
 import Test.Sandwich.Formatters.LogSaver
@@ -197,7 +196,7 @@ main :: IO ()
 main = runSandwichWithCommandLineArgs options documentation
   where
     options = defaultOptions {
-      optionsTestArtifactsDirectory = TestArtifactsGeneratedDirectory "test_runs" (show <$> getCurrentTime)
+      optionsTestArtifactsDirectory = defaultTestArtifactsDirectory
       , optionsFormatters = [SomeFormatter defaultLogSaverFormatter]
       , optionsProjectRoot = Just "sandwich"
       }