Changeset 70796 in vbox

Timestamp:

Jan 29, 2018 6:01:27 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit/serial/tdSerial1: Add loopback module for TCP/named pipe modes to relay sent data back to the guest. Named pipe support for Windows is missing

Location:

trunk/src/VBox/ValidationKit/tests/serial

Files:

• Makefile.kmk (modified) (1 diff)
• loopback.py (added)
• tdSerial1.py (modified) (7 diffs)

trunk/src/VBox/ValidationKit/tests/serial/Makefile.kmk

@@ -33 +33 @@
 ValidationKitTestsSerial_INST = $(INST_VALIDATIONKIT)tests/serial/
 ValidationKitTestsSerial_EXEC_SOURCES := \
-        $(PATH_SUB_CURRENT)/tdSerial1.py
+        $(PATH_SUB_CURRENT)/tdSerial1.py \
+        $(PATH_SUB_CURRENT)/loopback.py
 
 VBOX_VALIDATIONKIT_PYTHON_SOURCES += $(ValidationKitTestsSerial_EXEC_SOURCES)

trunk/src/VBox/ValidationKit/tests/serial/tdSerial1.py

@@ -48 +48 @@
 from testdriver import reporter;
 from testdriver import vbox;
-
+from testdriver import vboxcon;
+
+import loopback;
 
 class tdSerial1(vbox.TestDriver):
@@ -59 +61 @@
         self.asRsrcs          = None;
         self.oTestVmSet       = self.oTestVmManager.selectSet(self.oTestVmManager.kfGrpStdSmoke);
-        self.asSerialModesDef = ['RawFile']; # @todo: Add Tcp, TcpServ, Pipe, PipeServ, HostDev
+        self.asSerialModesDef = ['RawFile', 'Tcp', 'TcpServ', 'NamedPipe', 'NamedPipeServ', 'HostDev'];
         self.asSerialModes    = self.asSerialModesDef;
-        self.asSerialTestsDef = ['Write']; # @todo: Add read write and modem line control
+        self.asSerialTestsDef = ['Write', 'ReadWrite'];
         self.asSerialTests    = self.asSerialTestsDef;
+        self.oLoopback        = None;
+        self.sLocation        = None;
 
     #
@@ -132 +136 @@
         return os.path.join(oTestDrv.sScratchPath, oTestVm.sVmName + sInfix + sRandom + sSuffix);
 
-    def testWrite(self, oSession, oTxsSession, sCom1RawFile, oTestVm):
+    def setupSerialMode(self, oSession, oTestVm, sMode):
+        """
+        Sets up the serial mode.
+        """
+        fRc = True;
+        fServer = False;
+        sLocation = None;
+        ePortMode = vboxcon.PortMode_Disconnected;
+        if sMode == 'RawFile':
+            sLocation = self._generateRawPortFilename(self, oTestVm, '-com1-', '.out');
+            ePortMode = vboxcon.PortMode_RawFile;
+        elif sMode == 'Tcp':
+            sLocation = '127.0.0.1:1234';
+            self.oLoopback = loopback.SerialLoopback(loopback.g_ksLoopbackTcpServ, sLocation);
+            ePortMode = vboxcon.PortMode_TCP;
+        elif sMode == 'TcpServ':
+            fServer   = True;
+            sLocation = '1234';
+            ePortMode = vboxcon.PortMode_TCP;
+            self.oLoopback = loopback.SerialLoopback(loopback.g_ksLoopbackTcpClient, '127.0.0.1:1234');
+        elif sMode == 'NamedPipe':
+            sLocation = self._generateRawPortFilename(self, oTestVm, '-com1-', '.out');
+            ePortMode = vboxcon.PortMode_HostPipe;
+            self.oLoopback = loopback.SerialLoopback(loopback.g_ksLoopbackNamedPipeServ, sLocation);
+        elif sMode == 'NamedPipeServ':
+            fServer   = True;
+            sLocation = self._generateRawPortFilename(self, oTestVm, '-com1-', '.out');
+            ePortMode = vboxcon.PortMode_HostPipe;
+            self.oLoopback = loopback.SerialLoopback(loopback.g_ksLoopbackNamedPipeClient, sLocation);
+        elif sMode == 'HostDev':
+            sLocation = '/dev/ttyUSB0';
+            ePortMode = vboxcon.PortMode_HostDevice;
+        else:
+            reporter.log('warning, invalid mode %s given' % (sMode, ));
+            fRc = False;
+
+        if fRc:
+            fRc = oSession.changeSerialPortAttachment(0, ePortMode, sLocation, fServer);
+            if fRc and (sMode == 'TcpServ' or sMode == 'NamedPipeServ'):
+                self.sleep(2); # Fudge to allow the TCP server to get started.
+                fRc = self.oLoopback.connect();
+                if not fRc:
+                    reporter.log('Failed to connect to %s' % (sLocation, ));
+            self.sLocation = sLocation;
+
+        return fRc;
+
+    def testWrite(self, oSession, oTxsSession, oTestVm, sMode):
         """
         Does a simple write test verifying the output.
@@ -149 +200 @@
         if not fRc:
             reporter.testFailure('Running serial test utility failed');
-        else:
+        elif sMode == 'RawFile':
             # Open serial port and verify
             cLast = 0;
             try:
-                oFile = open(sCom1RawFile, 'rb');
+                oFile = open(self.sLocation, 'rb');
                 sFmt = '=I';
                 cBytes = 4;
@@ -169 +220 @@
                 reporter.testFailure('Verifying the written data failed');
         reporter.testDone();
+        return fRc;
+
+    def testReadWrite(self, oSession, oTxsSession, oTestVm):
+        """
+        Does a simple write test verifying the output.
+        """
+        _ = oSession;
+
+        reporter.testStart('ReadWrite');
+        tupCmdLine = ('SerialTest', '--tests', 'readwrite', '--txbytes', '1048576', '--device');
+        if oTestVm.isWindows():
+            tupCmdLine += (r'\\.\COM1',);
+        elif oTestVm.isLinux():
+            tupCmdLine += (r'/dev/ttyS0',);
+
+        fRc = self.txsRunTest(oTxsSession, 'SerialTest', 600 * 1000, \
+            '${CDROM}/${OS/ARCH}/SerialTest${EXESUFF}', tupCmdLine);
+        if not fRc:
+            reporter.testFailure('Running serial test utility failed');
+
+        reporter.testDone();
+        return fRc;
+
+    def isModeCompatibleWithTest(self, sMode, sTest):
+        """
+        Returns whether the given port mode and test combination is
+        supported for testing.
+        """
+        if sMode == 'RawFile' and sTest == 'ReadWrite':
+            return False;
+        elif sMode != 'RawFile' and sTest == 'Write':
+            return False;
+
+        return True;
 
     def testOneVmConfig(self, oVM, oTestVm):
@@ -177 +262 @@
         # Reconfigure the VM
         fRc = True;
-        sCom1RawFile = self._generateRawPortFilename(self, oTestVm, '-com1-', '.out');
         oSession = self.openSession(oVM);
         if oSession is not None:
-            fRc = oSession.setupSerialToRawFile(0, sCom1RawFile)
+            fRc = oSession.enableSerialPort(0);
 
             fRc = fRc and oSession.saveSettings();
@@ -194 +278 @@
                 self.addTask(oTxsSession);
 
-                for sTest in self.asSerialTests:
-                    if sTest == 'Write':
-                        fRc = self.testWrite(oSession, oTxsSession, sCom1RawFile, oTestVm);
+                for sMode in self.asSerialModes:
+                    reporter.testStart(sMode);
+                    fRc = self.setupSerialMode(oSession, oTestVm, sMode);
+                    if fRc:
+                        for sTest in self.asSerialTests:
+                            # Skip tests which don't work with the current mode.
+                            if self.isModeCompatibleWithTest(sMode, sTest):
+                                if sTest == 'Write':
+                                    fRc = self.testWrite(oSession, oTxsSession, oTestVm, sMode);
+                                if sTest == 'ReadWrite':
+                                    fRc = self.testReadWrite(oSession, oTxsSession, oTestVm);
+                        if self.oLoopback is not None:
+                            self.oLoopback.shutdown();
+                            self.oLoopback = None;
+
+                    reporter.testDone();
 
                 self.removeTask(oTxsSession);