From 8d246f02cd95ba836a198de70c849f01c687d568 Mon Sep 17 00:00:00 2001
From: renxiang <renxiang11@huawei.com>
Date: Wed, 14 Jul 2021 11:15:13 +0800
Subject: [PATCH] modify nfs stablity issue, before execute each suite bin,
 mount nfs

Signed-off-by: renxiang <renxiang11@huawei.com>
---
 config/user_config.xml         |  1 +
 src/core/driver/lite_driver.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/config/user_config.xml b/config/user_config.xml
index 6f1985b..c9d2ac6 100755
--- a/config/user_config.xml
+++ b/config/user_config.xml
@@ -63,6 +63,7 @@
   <!-- configure NFS mount path for test cases -->
   <NFS>
     <host_dir></host_dir>
+    <mnt_cmd></mnt_cmd>
     <board_dir></board_dir>
   </NFS>
 </user_config>
diff --git a/src/core/driver/lite_driver.py b/src/core/driver/lite_driver.py
index 72e2a1c..8ac1f17 100755
--- a/src/core/driver/lite_driver.py
+++ b/src/core/driver/lite_driver.py
@@ -57,6 +57,7 @@ class LiteUnitTest(IDriver):
     config = None
     log = platform_logger("LiteUnitTest")
     nfs_dir = ""
+    mnt_cmd = ""
     lite_device = None
     result = None
 
@@ -105,6 +106,32 @@ class LiteUnitTest(IDriver):
             return
         self.log.info("lite device execute request success")
 
+    def _mount_nfs_server(self):
+        #before execute each suits bin, mount nfs
+        self.mnt_cmd = "mount {}".format(UserConfigManager().get_user_config(
+            "NFS").get("mnt_cmd"))
+        if self.mnt_cmd == "mount ":
+            self.log.error("no configure for mount command")
+            return
+        
+        filter_result, status, _ = \
+            self.lite_device.execute_command_with_timeout(
+            self.mnt_cmd, case_type=DeviceTestType.lite_cpp_test, timeout=10)
+        if "already mounted" in filter_result:
+            self.log.info("nfs has been mounted")
+            return
+            
+        for i in range(0, 2):
+            if status:
+                self.log.info("execute mount command success")
+                return
+            self.log.info("try mount %d" % (i + 2))
+            _, status, _ = self.lite_device.execute_command_with_timeout(
+                self.mnt_cmd, case_type=DeviceTestType.lite_cpp_test,
+                timeout=10)
+
+        self.log.error("execute mount command failed")
+
     def _before_execute_test(self):
         """
         need copy test case to nfs dir
@@ -116,6 +143,7 @@ class LiteUnitTest(IDriver):
         if self.nfs_dir == "":
             self.log.error("no configure for nfs directory")
             return False
+        self._mount_nfs_server()
         _, status, _ = \
             self.lite_device.execute_command_with_timeout("cd /{}".format(
                 UserConfigManager().get_user_config("NFS").get("board_dir")),
-- 
GitLab