Changeset 94509 in vbox

Timestamp:

Apr 7, 2022 12:07:16 PM (2 years ago)

Author:

vboxsync

Message:

Validation Kit: Added functionality to return expanded strings from TxS to the host.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• txsclient.py (modified) (2 diffs)
• vbox.py (modified) (1 diff)

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

@@ -1330 +1330 @@
         return rc;
 
+    def taskExpandString(self, sString):
+        rc = self.sendMsg('EXP STR ', (sString));
+        if rc is True:
+            rc = False;
+            cbMsg, sOpcode, abPayload = self.recvReply();
+            if cbMsg is not None:
+                sOpcode = sOpcode.strip();
+                if sOpcode == "STRING":
+                    sStringExp = getSZ(abPayload, 0);
+                    if sStringExp is not None:
+                        rc = sStringExp;
+                else: # Also handles SHORTSTR reply (not enough space to store result).
+                    reporter.maybeErr(self.fErr, 'taskExpandString got a bad reply: %s' % (sOpcode,));
+            else:
+                reporter.maybeErr(self.fErr, 'taskExpandString got 3xNone from recvReply.');
+        return rc;
+
     # pylint: enable=missing-docstring
 
@@ -1836 +1853 @@
         """Synchronous version."""
         return self.asyncToSync(self.asyncUnpackFile, sRemoteFile, sRemoteDir, cMsTimeout, fIgnoreErrors);
+
+    def asyncExpandString(self, sString, cMsTimeout = 120000, fIgnoreErrors = False):
+        """
+        Initiates an expand string task.
+
+        Returns expanded string on success, False on failure (logged).
+
+        The task returns True on success, False on failure (logged).
+        """
+        return self.startTask(cMsTimeout, fIgnoreErrors, "expandString", self.taskExpandString,
+                              (sString));
+
+    def syncExpandString(self, sString, cMsTimeout = 120000, fIgnoreErrors = False):
+        """Synchronous version."""
+        return self.asyncToSync(self.asyncExpandString, sString, cMsTimeout, fIgnoreErrors);
 
 

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

@@ -3737 +3737 @@
                               (sRemoteFile, sRemoteDir, self.adjustTimeoutMs(cMsTimeout), fIgnoreErrors));
 
+    def txsExpandString(self, oSession, oTxsSession, sString, cMsTimeout = 30000, fIgnoreErrors = False):
+        return self.txsDoTask(oSession, oTxsSession, oTxsSession.asyncExpandString, \
+                              (sString, self.adjustTimeoutMs(cMsTimeout), fIgnoreErrors));
+
     # pylint: enable=missing-docstring