Simplify a bit more the test harness

We can build the test groups directly in the `testSuite' helper,
instead of doing it (much later) in the test harness.

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

htest/Test/Ganeti/TestHelper.hs

@@ -81,10 +81,10 @@ testSuite :: String -> [Name] -> Q [Dec]
 testSuite tsname tdef = do
   let fullname = mkName $ "test" ++ mapSlashes tsname
   tests <- mapM run tdef
-  sigtype <- [t| (String, [Test]) |]
+  sigtype <- [t| Test |]
+  body <- [| testGroup $(litE $ stringL tsname) $(return $ ListE tests) |]
   return [ SigD fullname sigtype
-         , ValD (VarP fullname) (NormalB (TupE [LitE (StringL tsname),
-                                                ListE tests])) []
+         , ValD (VarP fullname) (NormalB body) []
          ]
 
 -- | Builds an arbitrary value for a given constructor. This doesn't

htest/test.hs

@@ -69,7 +69,7 @@ defOpts = TestOptions
        }
 
 -- | All our defined tests.
-allTests :: [(String, [Test])]
+allTests :: [Test]
 allTests =
   [ testBasicTypes
   , testCommon
@@ -104,5 +104,4 @@ main :: IO ()
 main = do
   ropts <- getArgs >>= interpretArgsOrExit
   let opts = maybe defOpts (defOpts `mappend`) $ ropt_test_options ropts
-      tests = map (uncurry testGroup) allTests
-  defaultMainWithOpts tests (ropts { ropt_test_options = Just opts })
+  defaultMainWithOpts allTests (ropts { ropt_test_options = Just opts })