Revision 6f058bf2 qa/ganeti-qa.py
| b/qa/ganeti-qa.py | ||
|---|---|---|
| 475 | 475 |
RunGroupListTests() |
| 476 | 476 |
RunGroupRwTests() |
| 477 | 477 |
|
| 478 |
# The master shouldn't be readded or put offline; "delay" needs a non-master |
|
| 479 |
# node to test |
|
| 478 | 480 |
pnode = qa_config.AcquireNode(exclude=qa_config.GetMasterNode()) |
| 479 | 481 |
try: |
| 480 | 482 |
RunTestIf("node-readd", qa_node.TestNodeReadd, pnode)
|
| ... | ... | |
| 540 | 542 |
finally: |
| 541 | 543 |
qa_config.ReleaseNode(snode) |
| 542 | 544 |
|
| 543 |
# Test removing instance with offline drbd secondary |
|
| 544 |
if qa_config.TestEnabled("instance-remove-drbd-offline"):
|
|
| 545 |
snode = qa_config.AcquireNode(exclude=pnode) |
|
| 546 |
instance = \ |
|
| 547 |
qa_instance.TestInstanceAddWithDrbdDisk(pnode, snode) |
|
| 545 |
finally: |
|
| 546 |
qa_config.ReleaseNode(pnode) |
|
| 547 |
|
|
| 548 |
# Test removing instance with offline drbd secondary |
|
| 549 |
if qa_config.TestEnabled("instance-remove-drbd-offline"):
|
|
| 550 |
# Make sure the master is not put offline |
|
| 551 |
snode = qa_config.AcquireNode(exclude=qa_config.GetMasterNode()) |
|
| 552 |
try: |
|
| 553 |
pnode = qa_config.AcquireNode(exclude=snode) |
|
| 548 | 554 |
try: |
| 555 |
instance = qa_instance.TestInstanceAddWithDrbdDisk(pnode, snode) |
|
| 549 | 556 |
qa_node.MakeNodeOffline(snode, "yes") |
| 550 |
RunTest(qa_instance.TestInstanceRemove, instance) |
|
| 557 |
try: |
|
| 558 |
RunTest(qa_instance.TestInstanceRemove, instance) |
|
| 559 |
finally: |
|
| 560 |
qa_node.MakeNodeOffline(snode, "no") |
|
| 551 | 561 |
finally: |
| 552 |
qa_node.MakeNodeOffline(snode, "no") |
|
| 553 |
qa_config.ReleaseNode(snode) |
|
| 562 |
qa_config.ReleaseNode(pnode) |
|
| 563 |
finally: |
|
| 564 |
qa_config.ReleaseNode(snode) |
|
| 554 | 565 |
|
| 566 |
pnode = qa_config.AcquireNode() |
|
| 567 |
try: |
|
| 555 | 568 |
if qa_config.TestEnabled(["instance-add-plain-disk", "instance-export"]): |
| 556 | 569 |
for shutdown in [False, True]: |
| 557 | 570 |
instance = RunTest(qa_instance.TestInstanceAddWithPlainDisk, pnode) |
Also available in: Unified diff