Changeset 80238 in vbox for trunk/src

Timestamp:

Aug 12, 2019 10:54:43 PM (5 years ago)

Author:

vboxsync

Message:

ValKit/testboxscript: Another 'bad testbox' adjustment.

File:

• trunk/src/VBox/ValidationKit/testboxscript/testboxtasks.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testboxscript/testboxtasks.py

@@ -913 +913 @@
                 testboxcommons.log2('_threadProc: _monitorChild -> %s' % (fRc,));
 
-                # If the run failed, do explicit cleanup.
+                # If the run failed, do explicit cleanup unless its a BAD_TESTBOX, since BAD_TESTBOX is
+                # intended for pre-cleanup problems caused by previous test failures.  Do a cleanup on
+                # a BAD_TESTBOX could easily trigger an uninstallation error and change status to FAILED.
                 if fRc is not True:
-                    testboxcommons.log2('_threadProc: explicit cleanups...');
-                    self._terminateChild();
-                    self._cleanupAfter();
+                    if sResult != constants.result.BAD_TESTBOX:
+                        testboxcommons.log2('_threadProc: explicit cleanups...');
+                        self._terminateChild();
+                        self._cleanupAfter();
                     fNeedCleanUp = False;
             assert self._oChild is None;