Host test plugins: added custom serial port configuration, baudrate and timeout. This can now be done before host test will call run() function

workspace_tools/host_tests/echo.py

@@ -35,10 +35,8 @@ class EchoTest(Test):
         self.TEST_SERIAL_BAUDRATE = 115200
         self.TEST_LOOP_COUNT = 50
 
-        # Initializations
-        serial_init_res = self.mbed.init_serial(self.TEST_SERIAL_BAUDRATE)
-        if not serial_init_res:
-            self.print_result(self.RESULT_IO_SERIAL)
+        # Custom initialization for echo test
+        self.mbed.init_serial_params(serial_baud=self.TEST_SERIAL_BAUDRATE)
 
     def test(self):
         """ Test function, return True or False to get standard test notification on stdout
@@ -46,7 +44,6 @@ class EchoTest(Test):
         c = self.mbed.serial_readline() # '{{start}}'
         if c is None:
             return self.RESULT_IO_SERIAL
-        self.notify(c.strip())
 
         self.mbed.flush()
         self.notify("HOST: Starting the ECHO test")

workspace_tools/host_tests/host_test.py

@@ -104,21 +104,35 @@ class Mbed:
         self.program_cycle_s = float(self.options.program_cycle_s)
 
         self.serial = None
+        self.serial_baud = 9600
+        self.serial_timeout = 1
+
         self.timeout = self.DEFAULT_TOUT if self.options.timeout is None else self.options.timeout
         print 'MBED: Instrumentation: "%s" and disk: "%s"' % (self.port, self.disk)
 
-    def init_serial(self, baud=9600):
-        """ Initialize serial port. Function will return error is port can't be opened or initialized
+    def init_serial_params(self, serial_baud=9600, serial_timeout=1):
+        """ Initialize port parameters.
+            This parameters will be used by self.init_serial() function to open serial port
         """
+        self.serial_baud = serial_baud
+        self.serial_timeout = serial_timeout
+
+    def init_serial(self, serial_baud=None, serial_timeout=None):
+        """ Initialize serial port.
+            Function will return error is port can't be opened or initialized
+        """
+        # Overload serial port configuration from default to parameters' values if they are specified
+        serial_baud = serial_baud if serial_baud is not None else self.serial_baud
+        serial_timeout = serial_timeout if serial_timeout is not None else self.serial_timeout
+
         result = True
         try:
-            self.serial = Serial(self.port, timeout=1)
+            self.serial = Serial(self.port, baudrate=serial_baud, timeout=serial_timeout)
         except Exception as e:
             print "MBED: %s"% str(e)
             result = False
         # Port can be opened
         if result:
-            self.serial.setBaudrate(baud)
             self.flush()
         return result
 
@@ -152,7 +166,8 @@ class Mbed:
                 try:
                     c = self.serial.read(1)
                     result += c
-                except:
+                except Exception as e:
+                    print "MBED: %s"% str(e)
                     result = None
                     break
                 if c == '\n':
@@ -252,6 +267,12 @@ class Test(HostTestResults):
         if not result:
             self.print_result(self.RESULT_IOERR_COPY)
 
+        # Initialize and open target's serial port (console)
+        self.notify("HOST: Initialize serial port...")
+        result = self.mbed.init_serial()
+        if not result:
+            self.print_result(self.RESULT_IO_SERIAL)
+
         # Reset device
         self.notify("HOST: Reset target...")
         result = self.mbed.reset()
@@ -294,9 +315,6 @@ class DefaultTest(Test):
     def __init__(self):
         HostTestResults.__init__(self)
         Test.__init__(self)
-        serial_init_res = self.mbed.init_serial()
-        if not serial_init_res:
-            self.print_result(self.RESULT_IO_SERIAL)
 
 
 class Simple(DefaultTest):