Changeset 79067 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Jun 10, 2019 10:56:46 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131227

Message:

ValKit: Refactored sub-test driver initialization so it can have both a shortish name for --disable-sub-driver (new) and a test name for reporter.testStart. Working on extending tdGuestOsUnattendedInst1.py to do GA testings. bugref:9151

File:

• trunk/src/VBox/ValidationKit/testdriver/base.py (modified) (5 diffs)

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

@@ -741 +741 @@
     """
 
-    def __init__(self, sName, oTstDrv):
-        self.sName              = sName;
-        self.oTstDrv            = oTstDrv   # type: TestDriverBase
-        self.asRsrcs            = [];
+    def __init__(self, oTstDrv, sName, sTestName):
+        self.oTstDrv            = oTstDrv       # type: TestDriverBase
+        self.sName              = sName;        # For use with options (--enable-sub-driver sName:sName2)
+        self.sTestName          = sTestName;    # More descriptive for passing to reporter.testStart().
+        self.asRsrcs            = []            # type: List(str)
+        self.fEnabled           = True;         # TestDriverBase --enable-sub-driver and --disable-sub-driver.
 
     def showUsage(self):
@@ -753 +755 @@
         """
         reporter.log('');
-        reporter.log('Options for sub-test driver %s:' % (self.sName,));
+        reporter.log('Options for sub-test driver %s (%s):' % (self.sTestName, self.sName,));
         return True;
 
@@ -981 +983 @@
                 return iNext;
         return iArgs;
+
+    def findSubTstDrvByShortName(self, sShortName):
+        """
+        Locates a sub-test driver by it's short name.
+        Returns sub-test driver object reference if found, None if not.
+        """
+        for oSubTstDrv in self.aoSubTstDrvs:
+            if oSubTstDrv.sName == sShortName:
+                return oSubTstDrv;
+        return None;
 
 
@@ -1320 +1332 @@
         reporter.log('      Do not wipe clean the scratch area during the two clean up');
         reporter.log('      actions.  This is for facilitating nested test driver execution.');
+        if self.aoSubTstDrvs:
+            reporter.log('  --enable-sub-driver <sub1>[:..]');
+            reporter.log('  --disable-sub-driver <sub1>[:..]');
+            reporter.log('     Enables or disables one or more of the sub drivers: %s'
+                         % (', '.join([oSubTstDrv.sName for oSubTstDrv in self.aoSubTstDrvs]),));
         return True;
 
@@ -1348 +1365 @@
         elif asArgs[iArg] == '--no-wipe-clean':
             self.fNoWipeClean = True;
+        elif asArgs[iArg] in ('--enable-sub-driver', '--disable-sub-driver') and self.aoSubTstDrvs:
+            sOption = asArgs[iArg];
+            iArg = self.requireMoreArgs(1, asArgs, iArg);
+            for sSubTstDrvName in asArgs[iArg].split(':'):
+                oSubTstDrv = self.findSubTstDrvByShortName(sSubTstDrvName);
+                if oSubTstDrv is None:
+                    raise InvalidOption('Unknown sub-test driver given to %s: %s' % (sOption, sSubTstDrvName,));
+                oSubTstDrv.fEnabled = sOption == '--enable-sub-driver';
         elif (asArgs[iArg] == 'all' or asArgs[iArg] in self.asNormalActions) \
           and self.asActions in self.asSpecialActions: