Fixed several test procedures.

1 files changed, 15 insertions, 11 deletions

diff --git a/test-cli/test/tests/qrtc.py b/test-cli/test/tests/qrtc.py
index 884a290..0be0f99 100644
--- a/test-cli/test/tests/qrtc.py
+++ b/test-cli/test/tests/qrtc.py
@@ -1,11 +1,12 @@
-from test.helpers.syscmd import SysCommand
+import sh
 import unittest
 import time
+import re
 
 
 class Qrtc(unittest.TestCase):
     params = None
-    __rtc = "/dev/rtc0"
+    __rtc = None
 
     def __init__(self, testname, testfunc, varlist):
         self.params = varlist
@@ -17,16 +18,19 @@ class Qrtc(unittest.TestCase):
         self._testMethodDoc = testname
 
     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")