openharmony/testfwk_xdevice
1
0
Fork 0
mirror of https://gitee.com/openharmony/testfwk_xdevice synced 2025-02-17 00:39:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复告警问题

Browse Source 
Signed-off-by: deveco_test <liguangjie1@huawei.com>
This commit is contained in:
deveco_test 2022-08-26 10:28:35 +08:00
parent 511fe78c70
commit d08950f7d6
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
run.sh
View File

@ -22,7 +22,7 @@ error()
exit 1
}
PYTHON="python3"
TOOLS="tools"
TOOLS_DIR="tools"
flag=$(command -v $PYTHON | grep -c $PYTHON)
if [ "$flag" -eq 0 ]; then
@ -35,15 +35,15 @@ cd $(dirname "$0") || error "Failure to change direcory!"
$PYTHON -c "import pip" || error "Please install pip first!"
$PYTHON -c "import easy_install" || error "Please install setuptools first!"
if [ ! -d $TOOLS ]; then
error "$TOOLS directory not exists"
if [ ! -d $TOOLS_DIR ]; then
error "$TOOLS_DIR directory not exists"
fi
$PYTHON -m pip uninstall -y xdevice
$PYTHON -m pip uninstall -y xdevice-extension
$PYTHON -m pip uninstall -y xdevice-ohos
for f in "$TOOLS"/*.egg
for f in "$TOOLS_DIR"/*.egg
do
if [ ! -e "$f" ]; then
error "Can not find xdevice package!"
@ -51,7 +51,7 @@ do
$PYTHON -m easy_install --user "$f" || echo "Error occurs to install $f!"
done
for f in "$TOOLS"/*.tar.gz
for f in "$TOOLS_DIR"/*.tar.gz
do
if [ ! -e "$f" ]; then
error "Can not find xdevice package!"

3
src/xdevice/_core/logger.py
View File

@ -381,7 +381,8 @@ class EncryptFileHandler(RotatingFileHandler):
# baseFilename is the attribute in FileHandler
base_file_name = getattr(self, "baseFilename", None)
return open(base_file_name, self.mode)
with open(base_file_name, self.mode) as handler:
return handler
def emit(self, record):
try:

29
src/xdevice/_core/report/reporter_helper.py
View File

@ -553,20 +553,21 @@ class VisionHelper:
LOG.error("Template file not exists")
return ""
file_context = open(self.template_name).read()
file_context = self._render_key("", ReportConstant.title_name,
title_name, file_context)
file_context = self._render_exec_info(file_context, exec_info)
file_context = self._render_summary(file_context, summary)
if render_target == ReportConstant.summary_vision_report:
file_context = self._render_suites(file_context, suites)
elif render_target == ReportConstant.details_vision_report:
file_context = self._render_cases(file_context, suites)
elif render_target == ReportConstant.failures_vision_report:
file_context = self._render_failure_cases(file_context, suites)
else:
LOG.error("Unsupported vision report type: %s", render_target)
return file_context
with open(self.template_name) as file:
file_context = file.read()
file_context = self._render_key("", ReportConstant.title_name,
title_name, file_context)
file_context = self._render_exec_info(file_context, exec_info)
file_context = self._render_summary(file_context, summary)
if render_target == ReportConstant.summary_vision_report:
file_context = self._render_suites(file_context, suites)
elif render_target == ReportConstant.details_vision_report:
file_context = self._render_cases(file_context, suites)
elif render_target == ReportConstant.failures_vision_report:
file_context = self._render_failure_cases(file_context, suites)
else:
LOG.error("Unsupported vision report type: %s", render_target)
return file_context
@classmethod
def _render_key(cls, prefix, key, new_str, update_context):