diff --git a/test/hs/Test/Ganeti/Block/Drbd/Parser.hs b/test/hs/Test/Ganeti/Block/Drbd/Parser.hs index 17b098841fbd9fd3cca02a8b12e21320d5206ef7..401f1ec3591ec65d3686832bb23005f59ed11e04 100644 --- a/test/hs/Test/Ganeti/Block/Drbd/Parser.hs +++ b/test/hs/Test/Ganeti/Block/Drbd/Parser.hs @@ -43,7 +43,7 @@ import Ganeti.Block.Drbd.Types -- | Function for testing whether a file is parsed correctly. testFile :: String -> DRBDStatus -> Assertion testFile fileName expectedContent = do - fileContent <- readPythonTestData fileName + fileContent <- readTestData fileName case A.parseOnly drbdStatusParser $ pack fileContent of Left msg -> assertFailure $ "Parsing failed: " ++ msg Right obtained -> assertEqual fileName expectedContent obtained diff --git a/test/hs/Test/Ganeti/TestCommon.hs b/test/hs/Test/Ganeti/TestCommon.hs index 72ae311ac94408420a4735f4de876e5f251dacb7..6dcc8ada7e857d9a11a2f149ed791872259bf780 100644 --- a/test/hs/Test/Ganeti/TestCommon.hs +++ b/test/hs/Test/Ganeti/TestCommon.hs @@ -289,14 +289,8 @@ testDataFilename datadir name = do src <- getSourceDir return $ src ++ datadir ++ name --- | Returns the content of the specified python test data file. -readPythonTestData :: String -> IO String -readPythonTestData filename = do - name <- testDataFilename "/test/data/" filename - readFile name - -- | Returns the content of the specified haskell test data file. readTestData :: String -> IO String readTestData filename = do - name <- testDataFilename "/test/data/htools/" filename + name <- testDataFilename "/test/data/" filename readFile name