From 0ae8735613c7e331e8beb6f564d451d619e21114 Mon Sep 17 00:00:00 2001 From: Teacher_Dong Date: Tue, 16 Jul 2024 15:14:51 +0800 Subject: [PATCH 1/2] Signed-off-by:Teacher_Dong --- .../distributed/distribute/distribute.py | 34 ++++++++++++------- install.sh | 1 + local_coverage/automate_execute/coverage.sh | 1 + 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/aw/python/distributed/distribute/distribute.py b/aw/python/distributed/distribute/distribute.py index ad29c82..1a36582 100755 --- a/aw/python/distributed/distribute/distribute.py +++ b/aw/python/distributed/distribute/distribute.py @@ -254,14 +254,17 @@ class Distribute: if self.hdc_tools != "hdc": if self._query_device_uuid(self.major) != '': - device_uuid_list += self._query_device_uuid(self.major) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_uuid(self.major)) if self._query_device_ip(device) != "": - agent_ip_list += self._query_device_ip(device) + "," + agent_ip_list = "{}{},".format( + agent_ip_list, self._query_device_ip(device)) for agent in self.agent_list: if self._query_device_uuid(agent): - device_uuid_list += self._query_device_uuid(agent) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_uuid(agent)) config_info = DEVICE_INFO_TEMPLATE % (agent_ip_list, "8888", device_uuid_list) @@ -270,14 +273,17 @@ class Distribute: self._write_device_config(config_info, config_agent_file) else: if self._query_device_agent_uuid(self.major): - device_uuid_list += self._query_device_agent_uuid(self.major) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_agent_uuid(self.major)) if self._query_device_hdc_ip(device): - agent_ip_list += self._query_device_hdc_ip(device) + "," + agent_ip_list = "{}{},".format( + agent_ip_list, self._query_device_hdc_ip(device)) for agent in self.agent_list: if self._query_device_agent_uuid(agent): - device_uuid_list += self._query_device_agent_uuid(agent) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_agent_uuid(agent)) config_info = DEVICE_INFO_TEMPLATE % (agent_ip_list, "8888", device_uuid_list) @@ -291,12 +297,14 @@ class Distribute: if self.hdc_tools != "hdc": if self._query_device_uuid(self.major) != "NoneTyple": - device_uuid_list += self._query_device_uuid(self.major) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_uuid(self.major)) for agent in self.agent_list: if self._query_device_ip(agent) != "" and self._query_device_uuid(agent) != "": - agent_ip_list += self._query_device_ip(agent) + "," - device_uuid_list += self._query_device_uuid(agent) + "," + agent_ip_list = "{}{},".format(agent_ip_list, self._query_device_ip(agent)) + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_uuid(agent)) config_info = DEVICE_INFO_TEMPLATE % (agent_ip_list, "8888", device_uuid_list) @@ -305,12 +313,14 @@ class Distribute: self._write_device_config(config_info, config_major_file) else: if self._query_device_major_uuid(self.major): - device_uuid_list += self._query_device_major_uuid(self.major) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_major_uuid(self.major)) for agent in self.agent_list: if self._query_device_major_uuid(agent): - agent_ip_list += self._query_device_hdc_ip(agent) + "," - device_uuid_list += self._query_device_major_uuid(agent) + "," + agent_ip_list = "{}{},".format(agent_ip_list, self._query_device_hdc_ip(agent)) + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_major_uuid(agent)) config_info = DEVICE_INFO_TEMPLATE % (agent_ip_list, "8888", device_uuid_list) diff --git a/install.sh b/install.sh index d74380b..35b3945 100755 --- a/install.sh +++ b/install.sh @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # +set -e sudo cp ohtest /usr/bin/ diff --git a/local_coverage/automate_execute/coverage.sh b/local_coverage/automate_execute/coverage.sh index af3848f..8a50364 100644 --- a/local_coverage/automate_execute/coverage.sh +++ b/local_coverage/automate_execute/coverage.sh @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # +set -e echo "++++++++++++++++++++start install package+++++++++++++++++++++++" -- Gitee From 1974d58434cb10a109c790e33cc7aba2204102d2 Mon Sep 17 00:00:00 2001 From: Teacher_Dong Date: Tue, 16 Jul 2024 15:23:15 +0800 Subject: [PATCH 2/2] Signed-off-by:Teacher_Dong --- libs/fuzzlib/README_zh.md | 7 ------- libs/fuzzlib/tools/run_result.py | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libs/fuzzlib/README_zh.md b/libs/fuzzlib/README_zh.md index bd8d505..3196a74 100644 --- a/libs/fuzzlib/README_zh.md +++ b/libs/fuzzlib/README_zh.md @@ -316,10 +316,3 @@ run -t FUZZ -ss developer_test -tm calculator ``` details_report.html ``` - - 最新测试报告 - - ``` - reports/latest - ``` - diff --git a/libs/fuzzlib/tools/run_result.py b/libs/fuzzlib/tools/run_result.py index 875403b..b8c1931 100644 --- a/libs/fuzzlib/tools/run_result.py +++ b/libs/fuzzlib/tools/run_result.py @@ -72,9 +72,11 @@ class RunResult(): result = ansi_escape.sub('', log_str) return result + # 获取日志 def get_log(self): return "code :{}, msg: {}".format(self.code, self.data) + # 分析结果 def analysis(self, result, outdir): pass -- Gitee