Revision 7d7609a3 qa/ganeti-qa.py
b/qa/ganeti-qa.py | ||
---|---|---|
269 | 269 |
RunTest(qa_instance.TestInstanceRemove, instance) |
270 | 270 |
del instance |
271 | 271 |
|
272 |
if qa_config.TestEnabled('instance-add-remote-raid-disk'): |
|
273 |
snode = qa_config.AcquireNode(exclude=pnode) |
|
274 |
try: |
|
275 |
instance = RunTest(qa_instance.TestInstanceAddWithRemoteRaidDisk, |
|
276 |
pnode, snode) |
|
277 |
RunCommonInstanceTests(instance) |
|
278 |
RunExportImportTests(instance, pnode) |
|
279 |
RunHardwareFailureTests(instance, pnode, snode) |
|
280 |
RunTest(qa_instance.TestInstanceRemove, instance) |
|
281 |
del instance |
|
282 |
finally: |
|
283 |
qa_config.ReleaseNode(snode) |
|
272 |
multinode_tests = [ |
|
273 |
('instance-add-remote-raid-disk', |
|
274 |
qa_instance.TestInstanceAddWithRemoteRaidDisk), |
|
275 |
('instance-add-drbd-disk', |
|
276 |
qa_instance.TestInstanceAddWithDrbdDisk), |
|
277 |
] |
|
278 |
|
|
279 |
for name, func in multinode_tests: |
|
280 |
if qa_config.TestEnabled(name): |
|
281 |
snode = qa_config.AcquireNode(exclude=pnode) |
|
282 |
try: |
|
283 |
instance = RunTest(func, pnode, snode) |
|
284 |
RunCommonInstanceTests(instance) |
|
285 |
RunExportImportTests(instance, pnode) |
|
286 |
RunHardwareFailureTests(instance, pnode, snode) |
|
287 |
RunTest(qa_instance.TestInstanceRemove, instance) |
|
288 |
del instance |
|
289 |
finally: |
|
290 |
qa_config.ReleaseNode(snode) |
|
284 | 291 |
|
285 | 292 |
finally: |
286 | 293 |
qa_config.ReleaseNode(pnode) |
Also available in: Unified diff