Changeset 56735 in vbox

Timestamp:

Jul 1, 2015 2:32:06 PM (10 years ago)

Author:

vboxsync

Message:

tdAddGuestCtrl.py: Try fix 4.3 runs.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (11 diffs)

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -452 +452 @@
         for (i, oStep) in enumerate(self.aoSteps):
             fRc2 = oStep.execute(oTstDrv, oGstCtrlSession, sMsgPrefix + ', step #%d' % i);
-            if fRc2 is False:
+            if fRc2 is True:
+                pass;
+            elif fRc2 is None:
+                reporter.log('skipping remaining %d steps' % (len(self.aoSteps) - i - 1,));
+                break;
+            else:
                 fRc = False;
         return fRc;
@@ -474 +479 @@
 
 
+class tdSessionStepBase(object):
+    """
+    Base class for the guest control session test steps.
+    """
+
+    def execute(self, oTstDrv, oGstCtrlSession, sMsgPrefix):
+        """
+        Executes the test step.
+
+        Returns True on success.
+        Returns False on failure (must be reported as error).
+        Returns None if to skip the remaining steps.
+        """
+        reporter.error('%s: Missing execute implementation: %s' % (sMsgPrefix, self,));
+        _ = oTstDrv;
+        _ = oGstCtrlSession;
+        return False;
+
+
+class tdStepRequireMinimumApiVer(tdSessionStepBase):
+    """
+    Special test step which will cause executeSteps to skip the remaining step
+    if the VBox API is too old:
+    """
+    def __init__(self, fpMinApiVer):
+        self.fpMinApiVer = fpMinApiVer;
+
+    def execute(self, oTstDrv, oGstCtrlSession, sMsgPrefix):
+        """ Returns None if API version is too old, otherwise True. """
+        if oTstDrv.fpApiVer >= self.fpMinApiVer:
+            return True;
+        _ = oGstCtrlSession;
+        _ = sMsgPrefix;
+        return None; # Special return value. Don't use elsewhere.
+
 
 #
@@ -479 +519 @@
 #
 
-class tdStepSessionSetEnv(object):
+class tdStepSessionSetEnv(tdSessionStepBase):
     """
     Guest session environment: schedule putenv
@@ -521 +561 @@
         return True;
 
-class tdStepSessionUnsetEnv(object):
+class tdStepSessionUnsetEnv(tdSessionStepBase):
     """
     Guest session environment: schedule unset.
@@ -562 +602 @@
         return True;
 
-class tdStepSessionBulkEnv(object):
+class tdStepSessionBulkEnv(tdSessionStepBase):
     """
     Guest session environment: Bulk environment changes.
@@ -605 +645 @@
 
 
-class tdStepSessionCheckEnv(object):
+class tdStepSessionCheckEnv(tdSessionStepBase):
     """
     Check the currently scheduled environment changes of a guest control session.
@@ -651 +691 @@
         return fRc;
 
+
 #
 # File system object statistics (i.e. stat()).
 #
 
-class tdStepStat(object):
+class tdStepStat(tdSessionStepBase):
     """
     Stats a file system object.
@@ -1477 +1518 @@
                               tdStepSessionSetEnv('FOO', 'BAR'),
                               tdStepSessionCheckEnv(['FOO=BAR',]),
+                              tdStepRequireMinimumApiVer(5.0), # 4.3 can't cope with the remainder.
                               tdStepSessionClearEnv(),
                               tdStepSessionCheckEnv(),
@@ -1500 +1542 @@
                               tdStepSessionSetEnv('FOO','BAR3'),
                               tdStepSessionCheckEnv([ 'FOO=BAR3',]),
+                              tdStepRequireMinimumApiVer(5.0), # 4.3 can't cope with the remainder.
                               # Add a little unsetting to the mix.
                               tdStepSessionSetEnv('BAR', 'BEAR'),
@@ -1516 +1559 @@
                               tdStepSessionBulkEnv(['FOO=bar', 'foo=bar', 'FOO=doofus', 'TMPDIR=/tmp', 'foo=bar2']),
                               tdStepSessionCheckEnv(['FOO=doofus', 'TMPDIR=/tmp', 'foo=bar2']),
+                              tdStepRequireMinimumApiVer(5.0), # 4.3 is buggy!
+                              tdStepSessionBulkEnv(['2=1+1', 'FOO=doofus2', ]),
+                              tdStepSessionCheckEnv(['2=1+1', 'FOO=doofus2', 'TMPDIR=/tmp', 'foo=bar2']),
                               ]),
             # Invalid variable names.
@@ -1526 +1572 @@
                               tdStepSessionSetEnv('=FOO', 'BAR', vbox.ComError.E_INVALIDARG),
                               tdStepSessionCheckEnv(),
+                              tdStepRequireMinimumApiVer(5.0), # 4.3 is buggy!
                               tdStepSessionBulkEnv(['=', 'foo=bar'], vbox.ComError.E_INVALIDARG),
                               tdStepSessionCheckEnv(),