From cdf402898e5557fecf93f425d0a440022263230b Mon Sep 17 00:00:00 2001 From: floraachy <1622042529@qq.com> Date: Fri, 8 Dec 2023 16:48:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9allure=20results?= =?UTF-8?q?=E5=8F=8Ahtml=E6=8A=A5=E5=91=8A=E7=9B=AE=E5=BD=95=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E7=94=A8=E6=88=B7=E4=BD=BF=E7=94=A8?= =?UTF-8?q?allure=E9=9C=80=E5=85=B7=E5=A4=87java=E7=8E=AF=E5=A2=83=202.=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E6=8D=95=E8=8E=B7=E7=BA=A7?= =?UTF-8?q?=E5=88=AB=E9=94=99=E8=AF=AF=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/settings.py | 7 ++----- utils/logger_utils/loguru_log.py | 10 +++++++++- utils/report_utils/allure_handle.py | 6 ++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/config/settings.py b/config/settings.py index 8ab0376..7a4a7db 100644 --- a/config/settings.py +++ b/config/settings.py @@ -86,14 +86,11 @@ class RunConfig: # ------------------------------------ 配置信息 ----------------------------------------------------# -# 0代表执行Excel和yaml两种格式的用例， 1 代表 yaml文件，2 用例代表Excel用例， 其他数值将不自动生成用例，仅能执行手动编写的用例 -CASE_FILE_TYPE = 1 - -# 0表示默认不发送任何通知， 1代表钉钉通知，2代表企业微信通知， 3代表邮件通知， 4代表所有途径都发送通知 +# 0表示默认不发送任何通知， 1 代表钉钉通知，2 代表企业微信通知， 3 代表邮件通知， 4 代表所有途径都发送通知 SEND_RESULT_TYPE = 0 # 指定日志收集级别 -LOG_LEVEL = "DEBUG" +LOG_LEVEL = "DEBUG" # 可选值：TRACE DEBUG INFO SUCCESS WARNING ERROR CRITICAL """ 支持的日志级别： TRACE: 最低级别的日志级别，用于详细追踪程序的执行。 diff --git a/utils/logger_utils/loguru_log.py b/utils/logger_utils/loguru_log.py index 4630341..d0a3934 100644 --- a/utils/logger_utils/loguru_log.py +++ b/utils/logger_utils/loguru_log.py @@ -41,6 +41,14 @@ def capture_logs(filename, level="TRACE", filter_type=None): :param filter_type: 日志过滤，如：将日志级别为ERROR的单独记录到一个文件中 :param level: 日志级别设置 """ + if level.upper() in ["TRACE", "DEBUG", "INFO", "SUCCESS", "WARNING", "ERROR", "CRITICAL"]: + level = level + else: + logger.error(f"level={level}, 值错误\n" + f"level的可选值是：TRACE DEBUG INFO SUCCESS WARNING ERROR CRITICAL\n" + f"将默认level=trace收集日志") + level = "TRACE" + logger.remove() # 清除之前的设置 dic = dict(sink=filename, # 日志保存路径 rotation='10 MB', @@ -56,5 +64,5 @@ def capture_logs(filename, level="TRACE", filter_type=None): logger.add(**dic) # 添加控制台输出 logger.add(sink=sys.stderr, - level="INFO", + level=level, format="{time:YYYY-MM-DD HH:mm:ss} | {level} | From {module}.{function}.{line} : {message}") diff --git a/utils/report_utils/allure_handle.py b/utils/report_utils/allure_handle.py index 828dc5d..dd0d0b3 100644 --- a/utils/report_utils/allure_handle.py +++ b/utils/report_utils/allure_handle.py @@ -78,8 +78,10 @@ class AllureReportBeautiful: self.allure_html_path = allure_html_path self.allure_results_path = allure_results_path else: - print(f"allure地址错误！allure_results_path={allure_results_path}， allure_html_path={allure_html_path}") - raise "allure地址错误！" + print(f"allure results以及allure html报告未生成~ \n" + f"allure报告生成依赖java环境，请检查运行环境是否正确安装JDK环境\n" + f"allure_results_path={allure_results_path}， allure_html_path={allure_html_path}\n") + raise "allure results以及allure html报告未生成~！\nallure报告生成依赖java环境，请检查运行环境是否正确安装JDK环境\nallure_results_path={allure_results_path}， allure_html_path={allure_html_path}\n" # 设置报告窗口的标题 def set_windows_title(self, new_title):