Revision 1c0f9d12

b/test/hs/Test/Ganeti/Block/Drbd/Parser.hs
43 43
-- | Function for testing whether a file is parsed correctly.
44 44
testFile :: String -> DRBDStatus -> Assertion
45 45
testFile fileName expectedContent = do
46
    fileContent <- readPythonTestData fileName
46
    fileContent <- readTestData fileName
47 47
    case A.parseOnly drbdStatusParser $ pack fileContent of
48 48
        Left msg -> assertFailure $ "Parsing failed: " ++ msg
49 49
        Right obtained -> assertEqual fileName expectedContent obtained
b/test/hs/Test/Ganeti/TestCommon.hs
289 289
        src <- getSourceDir
290 290
        return $ src ++ datadir ++ name
291 291

  
292
-- | Returns the content of the specified python test data file.
293
readPythonTestData :: String -> IO String
294
readPythonTestData filename = do
295
    name <- testDataFilename "/test/data/" filename
296
    readFile name
297

  
298 292
-- | Returns the content of the specified haskell test data file.
299 293
readTestData :: String -> IO String
300 294
readTestData filename = do
301
    name <- testDataFilename "/test/data/htools/" filename
295
    name <- testDataFilename "/test/data/" filename
302 296
    readFile name

Also available in: Unified diff