Changeset 62208 in vbox

Timestamp:

Jul 13, 2016 6:46:37 AM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/storage: Make sure to always delete the test disk, even if the VM failed to start up or timed out waiting for a connection to TXS

File:

• trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py

@@ -589 +589 @@
                 self.removeTask(oTxsSession);
                 self.terminateVmBySession(oSession)
-
-                # Remove disk
-                oSession = self.openSession(oVM);
-                if oSession is not None:
-                    try:
-                        oSession.o.machine.detachDevice(_ControllerTypeToName(eStorageController), 0, iDevice);
-
-                        # Remove storage controller if it is not an IDE controller.
-                        if     eStorageController is not vboxcon.StorageControllerType_PIIX3 \
-                           and eStorageController is not vboxcon.StorageControllerType_PIIX4:
-                            oSession.o.machine.removeStorageController(_ControllerTypeToName(eStorageController));
-
-                        oSession.saveSettings();
-                        self.oVBox.deleteHdByLocation(sDiskPath);
-                        oSession.saveSettings();
-                        oSession.close();
-                        oSession = None;
-                    except:
-                        reporter.errorXcpt('failed to detach/delete disk %s from storage controller' % (sDiskPath));
-                else:
-                    fRc = False;
             else:
                 fRc = False;
+
+            # Remove disk
+            oSession = self.openSession(oVM);
+            if oSession is not None:
+                try:
+                    oSession.o.machine.detachDevice(_ControllerTypeToName(eStorageController), 0, iDevice);
+
+                    # Remove storage controller if it is not an IDE controller.
+                    if     eStorageController is not vboxcon.StorageControllerType_PIIX3 \
+                       and eStorageController is not vboxcon.StorageControllerType_PIIX4:
+                        oSession.o.machine.removeStorageController(_ControllerTypeToName(eStorageController));
+
+                    oSession.saveSettings();
+                    self.oVBox.deleteHdByLocation(sDiskPath);
+                    oSession.saveSettings();
+                    oSession.close();
+                    oSession = None;
+                except:
+                    reporter.errorXcpt('failed to detach/delete disk %s from storage controller' % (sDiskPath));
+            else:
+                fRc = False;
+
         return fRc;