From 2ef21e6e9b160afbd67a3d81da3cfff9a387f112 Mon Sep 17 00:00:00 2001
From: Bernardo Dal Seno <bdalseno@google.com>
Date: Sun, 14 Apr 2013 16:31:35 +0200
Subject: [PATCH] QA: Test enabled disk templates with known configuration
The test failed because it was executed also in a configuration that wasn't
expected, i.e., with exclusive storage enabled.
Also the docstring is shortened, as it was being truncated in the QA output.
Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
qa/ganeti-qa.py | 8 ++++----
qa/qa_instance.py | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 25af5c024..d7b6a237d 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -626,10 +626,6 @@ def RunInstanceTests():
qa_config.ReleaseManyNodes(inodes)
qa_cluster.AssertClusterVerify()
- RunTestIf(
- "instance-add-restricted-by-disktemplates",
- qa_instance.TestInstanceCreationRestrictedByDiskTemplates)
-
def RunQa():
"""Main QA body.
@@ -729,6 +725,10 @@ def RunQa():
RunTestIf(["cluster-instance-policy", "instance-add-plain-disk"],
TestIPolicyPlainInstance)
+ RunTestIf(
+ "instance-add-restricted-by-disktemplates",
+ qa_instance.TestInstanceCreationRestrictedByDiskTemplates)
+
# Test removing instance with offline drbd secondary
if qa_config.TestEnabled(["instance-remove-drbd-offline",
"instance-add-drbd-disk"]):
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 23fbef5b3..33376b46f 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -1007,8 +1007,7 @@ def TestRemoveInstanceOfflineNode(instance, snode, set_offline, set_online):
def TestInstanceCreationRestrictedByDiskTemplates():
- """Test if adding instances is only possible if they use an enabled
- disk template."""
+ """Test adding instances for disbled disk templates."""
enabled_disk_templates = qa_config.GetEnabledDiskTemplates()
nodes = qa_config.AcquireManyNodes(2)
--
GitLab