Merge branch 'sopa-test'rel.0.1sopa-test

1 files changed, 34 insertions, 9 deletions

diff --git a/test-cli/test/tests/qserial.py b/test-cli/test/tests/qserial.py
index 43ba3c8..402e33f 100644
--- a/test-cli/test/tests/qserial.py
+++ b/test-cli/test/tests/qserial.py
@@ -1,30 +1,55 @@
-from test.helpers.syscmd import SysCommand
 import unittest
 import uuid
 import serial
 import time
 
+
 class Qserial(unittest.TestCase):
+    params = None
+    __port = None
+    __baudrate = None
+    __resultlist = None  # resultlist is a python list of python dictionaries
 
-    def __init__(self, testname, testfunc, port, baudrate):
+    # varlist: port, baudrate
+    def __init__(self, testname, testfunc, varlist):
+        self.params = varlist
         super(Qserial, self).__init__(testfunc)
-        self.__port = port
-        self.__serial = serial.Serial(self.__port, timeout=1)
-        self.__serial.baudrate = baudrate
+        if "port" in varlist:
+            self.__port = varlist["port"]
+        else:
+            raise Exception('port param inside Qserial must be defined')
+
+        if "baudrate" in varlist:
+            self.__baudrate = varlist["baudrate"]
+        else:
+            raise Exception('baudrate param inside Qserial must be defined')
         self._testMethodDoc = testname
+        self.__resultlist = []
+
+        # open serial connection
+        self.__serial = serial.Serial(self.__port, self.__baudrate, timeout=1)
 
     def __del__(self):
         self.__serial.close()
 
     def execute(self):
+        # generate a random uuid
+        test_uuid = str(uuid.uuid4()).encode()
+        # clean serial port
         self.__serial.flushInput()
         self.__serial.flushOutput()
-        test_uuid = str(uuid.uuid4()).encode()
+        # send the uuid through serial port
         self.__serial.write(test_uuid)
         time.sleep(0.05)  # there might be a small delay
         if self.__serial.inWaiting() == 0:
-            self.fail("failed: PORT {} wait timeout exceded, wrong communication?".format(self.__port))
+            self.fail("failed: port {} wait timeout exceded".format(self.__port))
         else:
-            if (self.__serial.readline() != test_uuid):
-                self.fail("failed: PORT {} write/read mismatch".format(self.__port))
+            # check if what it was sent is equal to what has been received
+            if self.__serial.readline() != test_uuid:
+                self.fail("failed: port {} write/read mismatch".format(self.__port))
+
+    def getresults(self):
+        return self.__resultlist
 
+    def gettextresult(self):
+        return ""