From c5bcb90b65f3c97d20a936e07508c584542e9686 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 5 Jun 2016 14:55:21 +0200 Subject: [PATCH] TESTS: don't use lazy IO -.- --- test/HPath/IO/CopyDirRecursiveCollectFailuresSpec.hs | 2 +- test/Utils.hs | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/test/HPath/IO/CopyDirRecursiveCollectFailuresSpec.hs b/test/HPath/IO/CopyDirRecursiveCollectFailuresSpec.hs index 4fdd0a2..be58015 100644 --- a/test/HPath/IO/CopyDirRecursiveCollectFailuresSpec.hs +++ b/test/HPath/IO/CopyDirRecursiveCollectFailuresSpec.hs @@ -180,10 +180,10 @@ spec = beforeAll_ upTmpDir $ before_ setupFiles $ after_ cleanupFiles $ ,"outputDir1/foo2/foo4" ,"outputDir1/foo2/foo4/inputFile6" ,"outputDir1/foo2/foo4/inputFile4"]) - sort c `shouldBe` sort shouldC deleteFile' "outputDir1/foo2/inputFile1" deleteFile' "outputDir1/foo2/inputFile2" deleteFile' "outputDir1/foo2/inputFile3" + sort c `shouldBe` sort shouldC it "copyDirRecursive (Strict, CollectFailures), no write permission on output dir" $ diff --git a/test/Utils.hs b/test/Utils.hs index 1eadf7a..7615da6 100644 --- a/test/Utils.hs +++ b/test/Utils.hs @@ -34,10 +34,7 @@ import System.IO.Unsafe ( unsafePerformIO ) -import System.Posix.Directory.Traversals - ( - allDirectoryContents - ) +import qualified System.Posix.Directory.Traversals as DT import System.Posix.Env.ByteString ( getEnv @@ -283,5 +280,5 @@ writeFile' ip bs = allDirectoryContents' :: ByteString -> IO [ByteString] {-# NOINLINE allDirectoryContents' #-} allDirectoryContents' ip = - withTmpDir ip $ \p -> allDirectoryContents (P.fromAbs p) + withTmpDir ip $ \p -> DT.allDirectoryContents' (P.fromAbs p)