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

Timestamp:

Apr 13, 2022 9:50:00 PM (3 years ago)

Author:

vboxsync

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

150959

Message:

Main/Machine+Medium+Snapshot+VirtualBox: Recursion elimination to save stack space. Caused trouble with the current settings limits already in ASAN builds, now much higher limits would be possible, but that's not urgent. Also fix the behavior of forgetting medium objects when unregistering VMs (was previously not doing what the API documentation said in the CleanupMode_UnregisterOnly case). bugref:7717

Settings.cpp: Recursion elimination and make the handling of settings reading and writing more similar.

ValidationKit/tests/api/tdTreeDepth1.py: Improve testcase. Make sure that VM unregistering does the right thing with the associated medium objects.

File:

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

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

@@ -34 +34 @@
 import os
 import sys
+import random
 
 # Only the main script needs to modify the path.
@@ -73 +74 @@
 
         try:
+            oVBox = self.oTstDrv.oVBoxMgr.getVirtualBox()
             oVM = self.oTstDrv.createTestVM('test-medium', 1, None, 4)
             assert oVM is not None
@@ -79 +81 @@
             fRc = True
             oSession = self.oTstDrv.openSession(oVM)
-            for i in range(1, 301):
+            cImages = 38 #00
+            for i in range(1, cImages + 1):
                 sHddPath = os.path.join(self.oTstDrv.sScratchPath, 'Test' + str(i) + '.vdi')
                 if i == 1:
@@ -93 +96 @@
             fRc = fRc and oSession.saveSettings()
             fRc = oSession.close() and fRc
-
-            # unregister and re-register to test loading of settings
+            ## @todo r=klaus: count known hard disk images, should be cImages
+
+            # unregister, making sure the images are closed
             sSettingsFile = oVM.settingsFilePath
-            reporter.log('unregistering VM')
-            oVM.unregister(vboxcon.CleanupMode_DetachAllReturnNone)
-            oVBox = self.oTstDrv.oVBoxMgr.getVirtualBox()
+            fDetachAll = random.choice([False, True])
+            if fDetachAll:
+                reporter.log('unregistering VM, DetachAll style')
+            else:
+                reporter.log('unregistering VM, UnregisterOnly style')
+            self.oTstDrv.forgetTestMachine(oVM)
+            if fDetachAll:
+                aoHDs = oVM.unregister(vboxcon.CleanupMode_DetachAllReturnHardDisksOnly)
+                for oHD in aoHDs:
+                    oHD.close()
+                aoHDs = None
+            else:
+                oVM.unregister(vboxcon.CleanupMode_UnregisterOnly)
+            oVM = None
+            
+            # If there is no base image (expected) then there are no leftover
+            # child images either. Can be changed later once the todos above
+            # and below are resolved.
+            cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(oVBox, 'hardDisks'))
+            reporter.log('API reports %i base images' % (cBaseImages))
+            fRc = fRc and cBaseImages == 0
+
+            # re-register to test loading of settings
             reporter.log('opening VM %s, testing config reading' % (sSettingsFile))
             oVM = oVBox.openMachine(sSettingsFile)
+            ## @todo r=klaus: count known hard disk images, should be cImages
+
+            reporter.log('unregistering VM')
+            oVM.unregister(vboxcon.CleanupMode_UnregisterOnly)
+            oVM = None
+
+            cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(oVBox, 'hardDisks'))
+            reporter.log('API reports %i base images' % (cBaseImages))
+            fRc = fRc and cBaseImages == 0
 
             assert fRc is True
@@ -115 +148 @@
 
         try:
+            oVBox = self.oTstDrv.oVBoxMgr.getVirtualBox()
             oVM = self.oTstDrv.createTestVM('test-snap', 1, None, 4)
             assert oVM is not None
@@ -126 +160 @@
 
             # take 250 snapshots (snapshot tree depth limit)
-            for i in range(1, 251):
+            cSnapshots = 13 #00
+            for i in range(1, cSnapshots + 1):
                 fRc = fRc and oSession.takeSnapshot('Snapshot ' + str(i))
             fRc = oSession.close() and fRc
-
-            # unregister and re-register to test loading of settings
+            oSession = None
+            reporter.log('API reports %i snapshots' % (oVM.snapshotCount))
+            fRc = fRc and oVM.snapshotCount == cSnapshots
+
+            assert fRc is True
+
+            # unregister, making sure the images are closed
             sSettingsFile = oVM.settingsFilePath
-            reporter.log('unregistering VM')
-            oVM.unregister(vboxcon.CleanupMode_DetachAllReturnNone)
-            oVBox = self.oTstDrv.oVBoxMgr.getVirtualBox()
+            fDetachAll = random.choice([False, True])
+            if fDetachAll:
+                reporter.log('unregistering VM, DetachAll style')
+            else:
+                reporter.log('unregistering VM, UnregisterOnly style')
+            self.oTstDrv.forgetTestMachine(oVM)
+            if fDetachAll:
+                aoHDs = oVM.unregister(vboxcon.CleanupMode_DetachAllReturnHardDisksOnly)
+                for oHD in aoHDs:
+                    oHD.close()
+                aoHDs = None
+            else:
+                oVM.unregister(vboxcon.CleanupMode_UnregisterOnly)
+            oVM = None
+
+            # If there is no base image (expected) then there are no leftover
+            # child images either. Can be changed later once the todos above
+            # and below are resolved.
+            cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(oVBox, 'hardDisks'))
+            reporter.log('API reports %i base images' % (cBaseImages))
+            fRc = fRc and cBaseImages == 0
+
+            # re-register to test loading of settings
             reporter.log('opening VM %s, testing config reading' % (sSettingsFile))
             oVM = oVBox.openMachine(sSettingsFile)
+            reporter.log('API reports %i snapshots' % (oVM.snapshotCount))
+            fRc = fRc and oVM.snapshotCount == cSnapshots
+
+            reporter.log('unregistering VM')
+            oVM.unregister(vboxcon.CleanupMode_UnregisterOnly)
+            oVM = None
+
+            cBaseImages = len(self.oTstDrv.oVBoxMgr.getArray(oVBox, 'hardDisks'))
+            reporter.log('API reports %i base images' % (cBaseImages))
+            fRc = fRc and cBaseImages == 0
 
             assert fRc is True