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

1 files changed, 31 insertions, 13 deletions

diff --git a/test-cli/test/tests/qrtc.py b/test-cli/test/tests/qrtc.py
index 1d02f78..df493d2 100644
--- a/test-cli/test/tests/qrtc.py
+++ b/test-cli/test/tests/qrtc.py
@@ -1,28 +1,46 @@
-from test.helpers.syscmd import SysCommand
+import sh
 import unittest
 import time
+import re
+
 
 class Qrtc(unittest.TestCase):
+    params = None
+    __rtc = None
+    __resultlist = None  # resultlist is a python list of python dictionaries
 
-    def __init__(self, testname, testfunc, rtc):
+    def __init__(self, testname, testfunc, varlist):
+        self.params = varlist
         super(Qrtc, self).__init__(testfunc)
-        self.__rtc = rtc
+        if "rtc" in varlist:
+            self.__rtc = varlist["rtc"]
+        else:
+            raise Exception('rtc param inside Qrtc must be defined')
         self._testMethodDoc = testname
+        self.__resultlist = []
 
     def execute(self):
-        str_cmd = "hwclock -f {}".format(self.__rtc)
-        rtc_set = SysCommand("rtc_set", str_cmd)
-        if rtc_set.execute() == 0:
-            curr_hour = rtc_set.getOutput().decode('ascii').split(" ")
-            time1 = int((curr_hour[4].split(":"))[2])
+        # get time from RTC peripheral
+        p = sh.hwclock("-f", self.__rtc)
+        if p.exit_code == 0:
+            time1 = re.search("([01]?[0-9]{1}|2[0-3]{1})[:][0-5]{1}[0-9]{1}[:][0-5]{1}[0-9]{1}",
+                              p.stdout.decode('ascii'))
             time.sleep(1)
-            if rtc_set.execute() == 0:
-                curr_hour = rtc_set.getOutput().decode('ascii').split(" ")
-                time2 = int((curr_hour[4].split(":"))[2])
-                if time1==time2:
+            # get time from RTC another time
+            p = sh.hwclock("-f", self.__rtc)
+            if p.exit_code == 0:
+                time2 = re.search("([01]?[0-9]{1}|2[0-3]{1})[:][0-5]{1}[0-9]{1}[:][0-5]{1}[0-9]{1}",
+                                  p.stdout.decode('ascii'))
+                # check if the seconds of both times are different
+                if time1 == time2:
                     self.fail("failed: RTC is not running")
             else:
-                self.fail("failed: couldn't execute hwclock command 2nd time")
+                self.fail("failed: couldn't execute hwclock command for the second time")
         else:
             self.fail("failed: couldn't execute hwclock command")
 
+    def getresults(self):
+        return self.__resultlist
+
+    def gettextresult(self):
+        return ""