Changeset 99112 in vbox for trunk/src/VBox/ValidationKit/tests/api

Timestamp:

Mar 22, 2023 12:42:20 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156477

Message:

ValidationKit/tests/api/tdTreeDepth1.py: Invoking Python's garbage
collector directly does trigger the call to Machine::uninit() but
Machine::uninit() can take some time to close up to 64 disks or 200
snapshots which means the test may fail as it did before. Since
Machine::uninit() is asynchronous we do need a small delay after the
garbage collection to allow all of the attached media to be closed.
Also, leverage the test driver's IVirtualBox object rather than using
our own to simplify the code.

File:

• trunk/src/VBox/ValidationKit/tests/api/tdTreeDepth1.py (modified) (12 diffs)

trunk/src/VBox/ValidationKit/tests/api/tdTreeDepth1.py

@@ -45 +45 @@
 import sys
 import random
+import time
 import gc
 
@@ -125 +126 @@
         return True;
 
-    def openAndRegisterMachine(self, oVBox, sSettingsFile):
+    def openAndRegisterMachine(self, sSettingsFile):
         """
         Helper routine which opens a VM and registers it.
@@ -133 +134 @@
             if self.oTstDrv.fpApiVer >= 7.0:
                 # Needs a password parameter since 7.0.
-                oVM = oVBox.openMachine(sSettingsFile, "");
+                oVM = self.oTstDrv.oVBox.openMachine(sSettingsFile, "");
             else:
-                oVM = oVBox.openMachine(sSettingsFile);
+                oVM = self.oTstDrv.oVBox.openMachine(sSettingsFile);
         except:
             reporter.logXcpt('openMachine(%s) failed' % (sSettingsFile));
@@ -144 +145 @@
 
         try:
-            oVBox.registerMachine(oVM);
+            self.oTstDrv.oVBox.registerMachine(oVM);
         except:
             reporter.logXcpt('registerMachine(%s) failed' % (sSettingsFile));
@@ -210 +211 @@
         # If there is no base image (expected) then there are no leftover
         # child images either.
-        oVBox = self.oTstDrv.oVBoxMgr.getVirtualBox();
-        if oVBox is None:
-            return False;
-
-        cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(oVBox, 'hardDisks'))
+        cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(self.oTstDrv.oVBox, 'hardDisks'))
         reporter.log('After unregister(DetachAllReturnHardDisksOnly): API reports %d base images' % (cBaseImages));
         if cBaseImages != 0:
@@ -220 +217 @@
 
         # re-register to test loading of settings
-        oVM = self.openAndRegisterMachine(oVBox, sSettingsFile);
+        oVM = self.openAndRegisterMachine(sSettingsFile);
         if oVM is None:
             return False;
@@ -243 +240 @@
         # the object when the garbage collector runs however this can take several seconds
         # so we invoke the Python garbage collector manually here so we don't have to wait.
-        reporter.log('Invoking python garbage collection to trigger Machine::uninit() which will close the attached disks');
         try:
             gc.collect();
@@ -249 +245 @@
             reporter.logXcpt();
 
-        cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(oVBox, 'hardDisks'));
+        reporter.log('Waiting three seconds for Machine::uninit() to be called to close the attached disks');
+        # Fudge factor: Machine::uninit() will be invoked when the oVM object is processed
+        # by the garbage collector above but it may take a few moments to close up to 64
+        # disks.
+        time.sleep(3);
+
+        cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(self.oTstDrv.oVBox, 'hardDisks'))
         reporter.log('After unregister(UnregisterOnly): API reports %d base images' % (cBaseImages));
         if cBaseImages != 0:
@@ -303 +305 @@
         # If there is no base image (expected) then there are no leftover
         # child images either.
-        oVBox = self.oTstDrv.oVBoxMgr.getVirtualBox()
-        if oVBox is None:
-            return False;
-
-        cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(oVBox, 'hardDisks'))
+        cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(self.oTstDrv.oVBox, 'hardDisks'))
         reporter.log('After unregister(DetachAllReturnHardDisksOnly): API reports %d base images' % (cBaseImages));
         fRc = fRc and cBaseImages == 0
@@ -314 +312 @@
 
         # re-register to test loading of settings
-        oVM = self.openAndRegisterMachine(oVBox, sSettingsFile);
+        oVM = self.openAndRegisterMachine(sSettingsFile);
         if oVM is None:
             return False;
@@ -336 +334 @@
         # the object when the garbage collector runs however this can take several seconds
         # so we invoke the Python garbage collector manually here so we don't have to wait.
-        reporter.log('Invoking python garbage collection to trigger Machine::uninit() which will close the attached disks');
         try:
             gc.collect();
@@ -342 +339 @@
             reporter.logXcpt();
 
-        cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(oVBox, 'hardDisks'))
+        reporter.log('Waiting three seconds for Machine::uninit() to be called to close the attached disks');
+        # Fudge factor: Machine::uninit() will be invoked when the oVM object is processed
+        # by the garbage collector above but it may take a few moments to close up to 200
+        # snapshots.
+        time.sleep(3);
+
+        cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(self.oTstDrv.oVBox, 'hardDisks'))
         reporter.log('After unregister(UnregisterOnly): API reports %d base images' % (cBaseImages));
         if cBaseImages != 0: