Changeset 99100 in vbox

Timestamp:

Mar 21, 2023 5:25:26 PM (23 months ago)

Author:

vboxsync

Message:

ValidationKit/tests/api/tdTreeDepth1.py: Rather than include a delay
which waits for Machine::uninit() to be called to close the attached
media after the reference count of the IMachine object ('oVM') has
dropped to zero we can instead trigger Python's garbage collector
directly (gc.collect()) which avoids the need for waiting.

File:

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

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

@@ -45 +45 @@
 import sys
 import random
-import time
+import gc
 
 # Only the main script needs to modify the path.
@@ -238 +238 @@
         oVM = None;
 
-        # Fudge factor: When unregistering a VM with CleanupMode_UnregisterOnly the
-        # associated medium objects will be closed when the Machine object is
-        # uninitialized so wait for that to complete.  Otherwise the check for
-        # cBaseImages below will race with the VM uninitialization and depending on
-        # which one wins can cause a test failure.
-        reporter.log('Waiting five seconds for Machine::uninit() to be called to close the attached disks');
-        time.sleep(5);
+        # When unregistering a VM with CleanupMode_UnregisterOnly the associated medium's
+        # objects will be closed when the corresponding Machine object ('oVM') is
+        # uninitialized.  Assigning the 'None' object to 'oVM' will cause Python to delete
+        # 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();
+        except:
+            reporter.logXcpt();
 
         cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(oVBox, 'hardDisks'));
@@ -328 +331 @@
         oVM = None;
 
-        # Fudge factor: When unregistering a VM with CleanupMode_UnregisterOnly the
-        # associated medium objects will be closed when the Machine object is
-        # uninitialized so wait for that to complete.  Otherwise the check for
-        # cBaseImages below will race with the VM uninitialization and depending on
-        # which one wins can cause a test failure.
-        reporter.log('Waiting five seconds for Machine::uninit() to be called to close the attached disks');
-        time.sleep(5);
+        # When unregistering a VM with CleanupMode_UnregisterOnly the associated medium's
+        # objects will be closed when the corresponding Machine object ('oVM') is
+        # uninitialized.  Assigning the 'None' object to 'oVM' will cause Python to delete
+        # 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();
+        except:
+            reporter.logXcpt();
 
         cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(oVBox, 'hardDisks'))