Remove duplicate test file functions

This patch unifies the functions that generated the tree
reorganisation discussion in the first place :)

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

diff --git a/test/hs/Test/Ganeti/Block/Drbd/Parser.hs b/test/hs/Test/Ganeti/Block/Drbd/Parser.hs
index 17b0988..401f1ec 100644 (file)
--- 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 72ae311..6dcc8ad 100644 (file)
--- 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