Commit 2ef21e6e authored by Bernardo Dal Seno's avatar Bernardo Dal Seno

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: default avatarBernardo Dal Seno <bdalseno@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 02cff8aa
......@@ -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"]):
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment