Changeset 84559 in vbox for trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py

Timestamp:

May 27, 2020 12:34:00 PM (5 years ago)

Author:

vboxsync

Message:

Main: bugref:9341: Added the VM deletion after testing.

File:

• trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py

@@ -1206 +1206 @@
         vbox.TestDriver.__init__(self);
         self.asRsrcs            = None;
-        self.asTestVMsDef       = [self.ksOsWindows, self.ksOsLinux];
+        self.asTestVMsDef       = [self.ksOsLinux, self.ksOsWindows];
         self.asTestVMs          = self.asTestVMsDef;
         self.asSkipVMs          = [];
@@ -1435 +1435 @@
         return fRc;
 
+    def deleteVM(self, oVM):
+        try:    self.oVBox.unregisterMachine(oVM.id);
+        except: pass;
+        if self.fpApiVer >= 4.0:
+            try:
+                if self.fpApiVer >= 4.3:
+                    oProgress = oVM.deleteConfig([]);
+                else:
+                    oProgress = oVM.delete(None);
+                self.waitOnProgress(oProgress);
+            except:
+                reporter.logXcpt();
+        else:
+            try:    oVM.deleteSettings();
+            except: reporter.logXcpt();
+        return None;
+
     def testAutostartOneCfg(self, sVmName):
         """
@@ -1463 +1480 @@
             if oSession is not None:
                 fRc = self.testAutostartRunProgs(oSession, sVmName, oVM);
-                self.terminateVmBySession(oSession)
+                self.terminateVmBySession(oSession);
+                self.deleteVM(oVM);
             else:
                 fRc = False;