Commit 65a884ef authored by Iustin Pop's avatar Iustin Pop
Browse files

QA: also run gnt-cluster repair-disk-sizes



So that we don't happen again to break this forever without realising
it.

The patch also replaces one ' with ".
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent e8f472d1
...@@ -179,6 +179,13 @@ def RunClusterTests(): ...@@ -179,6 +179,13 @@ def RunClusterTests():
RunTestIf(test, fn) RunTestIf(test, fn)
def RunRepairDiskSizes():
"""Run the repair disk-sizes test.
"""
RunTestIf("cluster-repair-disk-sizes", qa_cluster.TestClusterRepairDiskSizes)
def RunOsTests(): def RunOsTests():
"""Runs all tests related to gnt-os. """Runs all tests related to gnt-os.
...@@ -425,13 +432,14 @@ def RunQa(): ...@@ -425,13 +432,14 @@ def RunQa():
RunTest(qa_rapi.TestRapiInstanceRemove, rapi_instance, use_client) RunTest(qa_rapi.TestRapiInstanceRemove, rapi_instance, use_client)
del rapi_instance del rapi_instance
if qa_config.TestEnabled('instance-add-plain-disk'): if qa_config.TestEnabled("instance-add-plain-disk"):
instance = RunTest(qa_instance.TestInstanceAddWithPlainDisk, pnode) instance = RunTest(qa_instance.TestInstanceAddWithPlainDisk, pnode)
RunCommonInstanceTests(instance) RunCommonInstanceTests(instance)
RunGroupListTests() RunGroupListTests()
RunTest(qa_cluster.TestClusterEpo) RunTest(qa_cluster.TestClusterEpo)
RunExportImportTests(instance, pnode, None) RunExportImportTests(instance, pnode, None)
RunDaemonTests(instance, pnode) RunDaemonTests(instance, pnode)
RunRepairDiskSizes()
RunTest(qa_instance.TestInstanceRemove, instance) RunTest(qa_instance.TestInstanceRemove, instance)
del instance del instance
...@@ -456,6 +464,7 @@ def RunQa(): ...@@ -456,6 +464,7 @@ def RunQa():
RunTest(qa_instance.TestInstanceStartup, instance) RunTest(qa_instance.TestInstanceStartup, instance)
RunExportImportTests(instance, pnode, snode) RunExportImportTests(instance, pnode, snode)
RunHardwareFailureTests(instance, pnode, snode) RunHardwareFailureTests(instance, pnode, snode)
RunRepairDiskSizes()
RunTest(qa_instance.TestInstanceRemove, instance) RunTest(qa_instance.TestInstanceRemove, instance)
del instance del instance
finally: finally:
......
...@@ -62,6 +62,8 @@ ...@@ -62,6 +62,8 @@
"cluster-reserved-lvs": true, "cluster-reserved-lvs": true,
"cluster-modify": true, "cluster-modify": true,
"cluster-oob": true, "cluster-oob": true,
"cluster-redist-conf": true,
"cluster-repair-disk-sizes": true,
"group-list": true, "group-list": true,
"group-rwops": true, "group-rwops": true,
......
...@@ -466,3 +466,8 @@ def TestClusterCommand(): ...@@ -466,3 +466,8 @@ def TestClusterCommand():
def TestClusterDestroy(): def TestClusterDestroy():
"""gnt-cluster destroy""" """gnt-cluster destroy"""
AssertCommand(["gnt-cluster", "destroy", "--yes-do-it"]) AssertCommand(["gnt-cluster", "destroy", "--yes-do-it"])
def TestClusterRepairDiskSizes():
"""gnt-cluster repair-disk-sizes"""
AssertCommand(["gnt-cluster", "repair-disk-sizes"])
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