Revision 6f88e076 qa/ganeti-qa.py

b/qa/ganeti-qa.py
290 290
        RunTestIf("rapi", qa_rapi.TestRapiInstanceRenameAndBack,
291 291
                  rename_source, rename_target)
292 292
    finally:
293
      qa_config.ReleaseInstance(tgt_instance)
293
      tgt_instance.Release()
294 294

  
295 295
  RunTestIf(["instance-grow-disk"], qa_instance.TestInstanceGrowDisk, instance)
296 296

  
......
375 375
          RunTest(qa_instance.TestInstanceStartup, newinst)
376 376
          RunTest(qa_instance.TestInstanceRemove, newinst)
377 377
        finally:
378
          qa_config.ReleaseInstance(newinst)
378
          newinst.Release()
379 379
    finally:
380 380
      qa_config.ReleaseNode(expnode)
381 381

  
......
389 389
      finally:
390 390
        qa_config.ReleaseNode(tnode)
391 391
    finally:
392
      qa_config.ReleaseInstance(newinst)
392
      newinst.Release()
393 393

  
394 394

  
395 395
def RunDaemonTests(instance):
......
482 482
          qa_instance.TestInstanceRemove(instance2)
483 483
          qa_instance.TestInstanceRemove(instance1)
484 484
        finally:
485
          qa_config.ReleaseInstance(instance2)
485
          instance2.Release()
486 486
      finally:
487
        qa_config.ReleaseInstance(instance1)
487
        instance1.Release()
488 488

  
489 489
    if qa_config.TestEnabled("instance-add-drbd-disk"):
490 490
      snode = qa_config.AcquireNode()
......
497 497
          qa_cluster.AssertClusterVerify(fail=True, errors=exp_err)
498 498
          qa_instance.TestInstanceRemove(instance)
499 499
        finally:
500
          qa_config.ReleaseInstance(instance)
500
          instance.Release()
501 501
      finally:
502 502
        qa_config.ReleaseNode(snode)
503 503
    qa_cluster.TestSetExclStorCluster(old_es)
......
541 541
          RunRepairDiskSizes()
542 542
          RunTest(qa_instance.TestInstanceRemove, instance)
543 543
        finally:
544
          qa_config.ReleaseInstance(instance)
544
          instance.Release()
545 545

  
546 546
        del instance
547 547
      finally:
......
601 601
              RunCommonInstanceTests(rapi_instance)
602 602
            RunTest(qa_rapi.TestRapiInstanceRemove, rapi_instance, use_client)
603 603
          finally:
604
            qa_config.ReleaseInstance(rapi_instance)
604
            rapi_instance.Release()
605 605
          del rapi_instance
606 606

  
607 607
  finally:
......
635 635
          finally:
636 636
            qa_config.ReleaseNode(expnode)
637 637
        finally:
638
          qa_config.ReleaseInstance(instance)
638
          instance.Release()
639 639
        del expnode
640 640
        del instance
641 641
      qa_cluster.AssertClusterVerify()

Also available in: Unified diff