Changeset 56722 in vbox

Timestamp:

Jul 1, 2015 6:27:52 AM (10 years ago)

Author:

vboxsync

Message:

vboxinstaller.py: Propagate skipped status from sub-driver.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py (modified) (7 diffs)

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

@@ -50 +50 @@
 # Validation Kit imports.
 from common             import utils, webutils;
+from common.constants   import rtexitcode;
 from testdriver         import reporter;
 from testdriver.base    import TestDriverBase;
@@ -177 +178 @@
         fRc = True;
         if 'execute' not in self.asActions and 'all' not in self.asActions:
-            fRc = self._executeSubDriver([ 'cleanup-after', ]);
+            fRc = self._executeSubDriver([ 'cleanup-after', ], fMaySkip = False);
 
         if not self._killAllVBoxProcesses():
@@ -199 +200 @@
         based cleanup and finally swipe the scene with the heavy artillery.
         """
-        fRc1 = self._executeSubDriver([ 'abort', ]);
+        fRc1 = self._executeSubDriver([ 'abort', ], fMaySkip = False);
         fRc2 = TestDriverBase.actionAbort(self);
         fRc3 = self._killAllVBoxProcesses();
@@ -329 +330 @@
         return False;
 
-    def _executeSync(self, asArgs):
+    def _executeSync(self, asArgs, fMaySkip = False):
         """
         Executes a child process synchronously.
-        Returns True if the process executed successfully and returned 0,
-        otherwise False is returned.
+
+        Returns True if the process executed successfully and returned 0.
+        Returns None if fMaySkip is true and the child exits with RTEXITCODE_SKIPPED.
+        Returns False for all other cases.
         """
         reporter.log('Executing: %s' % (asArgs, ));
@@ -343 +346 @@
             return False;
         reporter.log('Exit code: %s (%s)' % (iRc, asArgs));
+        if fMaySkip and iRc == rtexitcode.RTEXITCODE_SKIPPED:
+            return None;
         return iRc is 0;
 
@@ -362 +367 @@
         return (iRc is 0, iRc);
 
-    def _executeSubDriver(self, asActions):
+    def _executeSubDriver(self, asActions, fMaySkip = True):
         """
         Execute the sub testdriver with the specified action.
@@ -369 +374 @@
         asArgs.append('--no-wipe-clean');
         asArgs.extend(asActions);
-        return self._executeSync(asArgs);
+        return self._executeSync(asArgs, fMaySkip = fMaySkip);
 
     def _maybeUnpackArchive(self, sMaybeArchive, fNonFatal = False):