From 0f25514aaa8805ebaf363ab02a0b2d6fb8159d71 Mon Sep 17 00:00:00 2001
From: stivn <sunteng10@huawei.com>
Date: Fri, 1 Apr 2022 15:34:11 +0800
Subject: [PATCH 1/2] Modified

Signed-off-by: stivn <sunteng10@huawei.com>
---
 config/framework_config.xml |  2 ++
 src/core/driver/drivers.py  | 39 ++++++++++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/config/framework_config.xml b/config/framework_config.xml
index 4bad38c..595fdf5 100755
--- a/config/framework_config.xml
+++ b/config/framework_config.xml
@@ -18,6 +18,8 @@
     <option name="ipcamera_hispark_aries" />
     <option name="ipcamera_hispark_taurus" />
     <option name="wifiiot_hispark_pegasus" />
+    <option name="Hi3516DV300" />
+    <option name="rk3568" />
   </productform>
   <test_category>
     <option name="UT"
diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py
index 5a160f4..3da4dc2 100755
--- a/src/core/driver/drivers.py
+++ b/src/core/driver/drivers.py
@@ -462,11 +462,13 @@ class CppTestDriver(IDriver):
             self.config.device.stop_catch_device_log()
 
     def _init_gtest(self):
-        self.config.device.hdc_command("remount")
+        self.config.device.hdc_command("target mount")
         self.config.device.execute_shell_command(
             "rm -rf %s" % self.config.target_test_path)
         self.config.device.execute_shell_command(
             "mkdir -p %s" % self.config.target_test_path)
+        self.config.device.execute_shell_command(
+            "mount -o rw,remount,rw /")
         if "fuzztest" == self.config.testtype[0]:
             self.config.device.execute_shell_command(
                 "mkdir -p %s" % os.path.join(self.config.target_test_path,
@@ -635,7 +637,7 @@ class JSUnitTestDriver(IDriver):
             with os.fdopen(hilog_open, "a") as hilog_file_pipe:
                 self.config.device.start_catch_device_log(hilog_file_pipe)
                 self._init_jsunit_test()
-                self._run_jsunit(suite_file)
+                self._run_jsunit(suite_file, hilog)
                 hilog_file_pipe.flush()
                 self.generate_console_output(hilog, request)
         finally:
@@ -648,10 +650,10 @@ class JSUnitTestDriver(IDriver):
         self.config.device.execute_shell_command(
             "mkdir -p %s" % self.config.target_test_path)
         self.config.device.execute_shell_command(
-            "mount -o rw,remount,rw /%s" % "system")
+            "mount -o rw,remount,rw /")
 
 
-    def _run_jsunit(self, suite_file):
+    def _run_jsunit(self, suite_file, device_log_file):
         filename = os.path.basename(suite_file)
 
         resource_manager = ResourceManager()
@@ -665,7 +667,30 @@ class JSUnitTestDriver(IDriver):
 
         if main_result:
             self._execute_hapfile_jsunittest()
-            self._uninstall_hap(self.package_name)
+            time.sleep(20)
+            try:
+                status = False
+                for i in range(0, 3):
+                    device_log_file_open = os.open(device_log_file, os.O_RDONLY,
+                                                   stat.S_IWUSR | stat.S_IRUSR)
+                    with os.fdopen(device_log_file_open, "r", encoding='utf-8') \
+                            as file_read_pipe:
+                        while True:
+                            data = file_read_pipe.readline()
+                            if not data or not data.strip():
+                                break
+                            if data.find("JSApp:") != -1:
+                                if data.find("[end] run suites end") != -1:
+                                    LOG.info("execute testcase success.")
+                                    status = True
+                                    break
+                    if status:
+                        break
+                    else:
+                        time.sleep(20)
+            finally:
+                _lock_screen(self.config.device)
+                self._uninstall_hap(self.package_name)
         else:
             self.result = result.get_test_results("Error: install hap failed")
             LOG.error("Error: install hap failed")
@@ -748,8 +773,8 @@ class JSUnitTestDriver(IDriver):
                 command, timeout=TIME_OUT)
 
             if "success" in str(result_value).lower():
-                LOG.info("execute %s's testcase success. result value=%s"
-                         % (self.package_name, result_value))
+                LOG.info("%s" % result_value)
+
                 time.sleep(30)
             else:
                 LOG.info("execute %s's testcase failed. result value=%s"
-- 
Gitee


From f6706488a10974c09d3dc17669ffcb78f6af9a5d Mon Sep 17 00:00:00 2001
From: stivn <sunteng10@huawei.com>
Date: Fri, 1 Apr 2022 17:13:11 +0800
Subject: [PATCH 2/2] modified

Signed-off-by: stivn <sunteng10@huawei.com>
---
 src/core/driver/drivers.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py
index 3da4dc2..cd9d473 100755
--- a/src/core/driver/drivers.py
+++ b/src/core/driver/drivers.py
@@ -667,14 +667,17 @@ class JSUnitTestDriver(IDriver):
 
         if main_result:
             self._execute_hapfile_jsunittest()
-            time.sleep(20)
             try:
                 status = False
-                for i in range(0, 3):
-                    device_log_file_open = os.open(device_log_file, os.O_RDONLY,
-                                                   stat.S_IWUSR | stat.S_IRUSR)
-                    with os.fdopen(device_log_file_open, "r", encoding='utf-8') \
-                            as file_read_pipe:
+                device_log_file_open = os.open(device_log_file, os.O_RDONLY,
+                                               stat.S_IWUSR | stat.S_IRUSR)
+                with os.fdopen(device_log_file_open, "r", encoding='utf-8') \
+                        as file_read_pipe:
+                    for i in range(0, 20):
+                        if status:
+                            break
+                        else:
+                            time.sleep(10)
                         while True:
                             data = file_read_pipe.readline()
                             if not data or not data.strip():
@@ -684,10 +687,6 @@ class JSUnitTestDriver(IDriver):
                                     LOG.info("execute testcase success.")
                                     status = True
                                     break
-                    if status:
-                        break
-                    else:
-                        time.sleep(20)
             finally:
                 _lock_screen(self.config.device)
                 self._uninstall_hap(self.package_name)
-- 
Gitee