Revision 7af293d7 qa/ganeti-qa.py
| b/qa/ganeti-qa.py | ||
|---|---|---|
| 273 | 273 |
RunTestIf(os_enabled, fn) |
| 274 | 274 |
|
| 275 | 275 |
|
| 276 |
def RunCommonInstanceTests(instance): |
|
| 276 |
def RunCommonInstanceTests(instance, inst_nodes):
|
|
| 277 | 277 |
"""Runs a few tests that are common to all disk types. |
| 278 | 278 |
|
| 279 | 279 |
""" |
| ... | ... | |
| 346 | 346 |
|
| 347 | 347 |
RunTestIf("tags", qa_tags.TestInstanceTags, instance)
|
| 348 | 348 |
|
| 349 |
if instance.disk_template == constants.DT_DRBD8: |
|
| 350 |
RunTestIf("cluster-verify",
|
|
| 351 |
qa_cluster.TestClusterVerifyDisksBrokenDRBD, instance, inst_nodes) |
|
| 349 | 352 |
RunTestIf("cluster-verify", qa_cluster.TestClusterVerify)
|
| 350 | 353 |
|
| 351 | 354 |
RunTestIf(qa_rapi.Enabled, qa_rapi.TestInstance, instance) |
| ... | ... | |
| 729 | 732 |
RunTest(qa_instance.TestInstanceStartup, instance) |
| 730 | 733 |
RunTestIf("instance-modify-disks",
|
| 731 | 734 |
qa_instance.TestInstanceModifyDisks, instance) |
| 732 |
RunCommonInstanceTests(instance) |
|
| 735 |
RunCommonInstanceTests(instance, inodes)
|
|
| 733 | 736 |
if qa_config.TestEnabled("instance-modify-primary"):
|
| 734 | 737 |
othernode = qa_config.AcquireNode() |
| 735 | 738 |
RunTest(qa_instance.TestInstanceModifyPrimaryAndBack, |
| ... | ... | |
| 802 | 805 |
use_client) |
| 803 | 806 |
try: |
| 804 | 807 |
if qa_config.TestEnabled("instance-plain-rapi-common-tests"):
|
| 805 |
RunCommonInstanceTests(rapi_instance) |
|
| 808 |
RunCommonInstanceTests(rapi_instance, [pnode])
|
|
| 806 | 809 |
RunTest(qa_rapi.TestRapiInstanceRemove, rapi_instance, use_client) |
| 807 | 810 |
finally: |
| 808 | 811 |
rapi_instance.Release() |
Also available in: Unified diff