From 82e4a672ca1235c954ed47a71a9bcc62204e58e9 Mon Sep 17 00:00:00 2001
From: Przemek Wirkus <przemyslaw.wirkus@arm.com>
Date: Thu, 10 Jul 2014 14:51:56 +0100
Subject: [PATCH] Added seral port read/write wrappers to handle serial port
 communication issues. Added IOERR_SERIAL handler for basic test. Other tests
 will be refactored in separate commits.

---
 workspace_tools/host_tests/host_test.py | 50 +++++++++++++++++++++----
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/workspace_tools/host_tests/host_test.py b/workspace_tools/host_tests/host_test.py
index cf1dc0d7dd..dd7d866ff8 100644
--- a/workspace_tools/host_tests/host_test.py
+++ b/workspace_tools/host_tests/host_test.py
@@ -57,12 +57,33 @@ class Mbed:
         print 'Mbed: "%s" "%s"' % (self.port, self.disk)
 
     def init_serial(self, baud=9600, extra_baud=9600):
-        self.serial = Serial(self.port, timeout = 1)
-        self.serial.setBaudrate(baud)
-        if self.extra_port:
-            self.extra_serial = Serial(self.extra_port, timeout = 1)
-            self.extra_serial.setBaudrate(extra_baud)
-        self.flush()
+        result = True
+        try:
+            self.serial = Serial(self.port, timeout=1)
+        except Exception as e:
+            result = False
+        # Port can be opened
+        if result:
+            self.serial.setBaudrate(baud)
+            if self.extra_port:
+                self.extra_serial = Serial(self.extra_port, timeout = 1)
+                self.extra_serial.setBaudrate(extra_baud)
+            self.flush()
+        return result
+
+    def serial_read(self, count=1):
+        """ Wraps self.mbed.serial object read method """
+        result = None
+        if self.serial:
+            result = self.serial.read(count)
+        return result
+
+    def serial_write(self, write_buffer):
+        """ Wraps self.mbed.serial object write method """
+        result = -1
+        if self.serial:
+            result = self.serial.write(write_buffer)
+        return result
 
     def safe_sendBreak(self, serial):
         """ Wraps serial.sendBreak() to avoid serial::serialposix.py exception on Linux
@@ -110,18 +131,28 @@ class Test:
             print str(e)
             self.print_result("error")
 
+    def setup(self):
+        """ Setup and check if configuration for test is correct. E.g. if serial port can be opened """
+        result = True
+        if not self.mbed.serial:
+            result = False
+            self.print_result("ioerr_serial")
+        return result
+
     def notify(self, message):
+        """ On screen notification function """
         print message
         stdout.flush()
 
     def print_result(self, result):
+        """ Test result unified printing function """
         self.notify("\n{%s}\n{end}" % result)
 
 
 class DefaultTest(Test):
     def __init__(self):
         Test.__init__(self)
-        self.mbed.init_serial()
+        serial_init_res = self.mbed.init_serial()
         self.mbed.reset()
 
 """
@@ -140,7 +171,10 @@ class Simple(DefaultTest):
     def run(self):
         try:
             while True:
-                c = self.mbed.serial.read(512)
+                c = self.mbed.serial_read(512)
+                if c is None:
+                    self.print_result("ioerr_serial")
+                    break
                 stdout.write(c)
                 stdout.flush()
         except KeyboardInterrupt, _: