Changeset 84788 in vbox

Timestamp:

Jun 11, 2020 7:56:16 AM (4 years ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Added new task for getting TXS' version information.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

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

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

@@ -696 +696 @@
             rc = self.recvAckLogged("BYE");
         self.oTransport.disconnect();
+        return rc;
+
+    def taskVer(self):
+        """Requests version information from TXS"""
+        rc = self.sendMsg("VER");
+        if rc is True:
+            rc = False;
+            cbMsg, sOpcode, abPayload = self.recvReply();
+            if cbMsg is not None:
+                sOpcode = sOpcode.strip();
+                if sOpcode == "ACK VER":
+                    sVer = getSZ(abPayload, 0);
+                    if sVer is not None:
+                        rc = sVer;
+                else:
+                    reporter.maybeErr(self.fErr, 'taskVer got a bad reply: %s' % (sOpcode,));
+            else:
+                reporter.maybeErr(self.fErr, 'taskVer got 3xNone from recvReply.');
         return rc;
 
@@ -1333 +1351 @@
         return self.asyncToSync(self.asyncDisconnect, cMsTimeout, fIgnoreErrors);
 
+    def asyncVer(self, cMsTimeout = 30000, fIgnoreErrors = False):
+        """
+        Initiates a task for getting the TXS version information.
+
+        Returns True on success, False on failure (logged).
+
+        The task returns the version string on success and False on failure.
+        """
+        return self.startTask(cMsTimeout, fIgnoreErrors, "ver", self.taskVer);
+
+    def syncVer(self, cMsTimeout = 30000, fIgnoreErrors = False):
+        """Synchronous version."""
+        return self.asyncToSync(self.asyncVer, cMsTimeout, fIgnoreErrors);
+
     def asyncUuid(self, cMsTimeout = 30000, fIgnoreErrors = False):
         """

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

@@ -3486 +3486 @@
                               (self.adjustTimeoutMs(cMsTimeout), fIgnoreErrors));
 
+    def txsVer(self, oSession, oTxsSession, cMsTimeout = 30000, fIgnoreErrors = False):
+        return self.txsDoTask(oSession, oTxsSession, oTxsSession.asyncVer,
+                              (self.adjustTimeoutMs(cMsTimeout), fIgnoreErrors));
+
     def txsUuid(self, oSession, oTxsSession, cMsTimeout = 30000, fIgnoreErrors = False):
         return self.txsDoTask(oSession, oTxsSession, oTxsSession.asyncUuid,