From cd04f8c25e03218cc417fa226787495583be99b6 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 28 Oct 2010 17:58:45 +0200
Subject: [PATCH] QA: Allow job queue test to be disabled
On my machine it takes over 30 seconds, disabling it can
speed up the QA.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
qa/ganeti-qa.py | 4 +++-
qa/qa-sample.json | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 8247a0dea..79a5d6e2b 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -101,11 +101,13 @@ def SetupCluster(rapi_user, rapi_secret):
if qa_config.TestEnabled('create-cluster'):
RunTest(qa_cluster.TestClusterInit, rapi_user, rapi_secret)
RunTest(qa_node.TestNodeAddAll)
- RunTest(qa_cluster.TestJobqueue)
else:
# consider the nodes are already there
qa_node.MarkNodeAddedAll()
+ if qa_config.TestEnabled("test-jobqueue"):
+ RunTest(qa_cluster.TestJobqueue)
+
# enable the watcher (unconditionally)
RunTest(qa_daemon.TestResumeWatcher)
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 824cf7865..3b1be0df6 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -38,6 +38,7 @@
"os": true,
"tags": true,
"rapi": true,
+ "test-jobqueue": true,
"create-cluster": true,
"cluster-verify": true,
--
GitLab