Changeset 92955 in vbox for trunk

Timestamp:

Dec 16, 2021 8:53:55 AM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Fixed more VM left-over bugs on failures due to changed Main APIs over time.

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -2497 +2497 @@
             oSession.close();
         if not fRc:
-            try:    self.oVBox.unregisterMachine(oVM.id);
-            except: pass;
             if self.fpApiVer >= 4.0:
+                try:    oVM.unregister(vboxcon.CleanupMode_Full);
+                except: reporter.logXcpt();
                 try:
                     if self.fpApiVer >= 4.3:
                         oProgress = oVM.deleteConfig([]);
                     else:
-                        oProgress = oVM.delete(None);
+                        oProgress = oVM.delete([]);
                     self.waitOnProgress(oProgress);
                 except:
                     reporter.logXcpt();
             else:
+                try:    self.oVBox.unregisterMachine(oVM.id);
+                except: reporter.logXcpt();
                 try:    oVM.deleteSettings();
                 except: reporter.logXcpt();
@@ -2597 +2599 @@
 
             # Failed. Unregister the machine and delete it.
-            try:    self.oVBox.unregisterMachine(oVM.id);
-            except: pass;
-
             if self.fpApiVer >= 4.0:
+                try:    oVM.unregister(vboxcon.CleanupMode_Full);
+                except: reporter.logXcpt();
                 try:
                     if self.fpApiVer >= 4.3:
                         oProgress = oVM.deleteConfig([]);
                     else:
-                        oProgress = oVM.delete(None);
+                        oProgress = oVM.delete([]);
                     self.waitOnProgress(oProgress);
                 except:
                     reporter.logXcpt();
             else:
+                try:    self.oVBox.unregisterMachine(oVM.id);
+                except: reporter.logXcpt();
                 try:    oVM.deleteSettings();
                 except: reporter.logXcpt();