Merge three small cluster tests into one.

Reviewed-by: schreiberal

qa/ganeti-qa.py

@@ -90,14 +90,10 @@ def RunClusterTests():
     RunTest(qa_cluster.TestClusterVerify)
 
   if qa_config.TestEnabled('cluster-info'):
+    RunTest(qa_cluster.TestClusterVersion)
     RunTest(qa_cluster.TestClusterInfo)
-
-  if qa_config.TestEnabled('cluster-getmaster'):
     RunTest(qa_cluster.TestClusterGetmaster)
 
-  if qa_config.TestEnabled('cluster-version'):
-    RunTest(qa_cluster.TestClusterVersion)
-
   if qa_config.TestEnabled('cluster-copyfile'):
     RunTest(qa_cluster.TestClusterCopyfile)
 

qa/qa-sample.yaml

@@ -30,8 +30,6 @@ tests:
 
   cluster-verify: True
   cluster-info: True
-  cluster-getmaster: True
-  cluster-version: True
   cluster-burnin: True
   cluster-command: True
   cluster-copyfile: True