From 62843684f16c3a66a768646790692a91f0968fdd Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 5 Nov 2007 12:18:49 +0000
Subject: [PATCH] Merge three small cluster tests into one.
Reviewed-by: schreiberal
---
qa/ganeti-qa.py | 6 +-----
qa/qa-sample.yaml | 2 --
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index d87761378..f05c30ae4 100755
--- a/qa/ganeti-qa.py
+++ b/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)
diff --git a/qa/qa-sample.yaml b/qa/qa-sample.yaml
index fb1cab581..c13fe9c96 100644
--- a/qa/qa-sample.yaml
+++ b/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
--
GitLab