From 1a3c05bed45ad05f03b7be0ce6ad18c2105ca4dc Mon Sep 17 00:00:00 2001 From: floraachy <1622042529@qq.com> Date: Mon, 19 Jun 2023 15:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common_utils/yagmail_handle.py | 1 - run.py | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common_utils/yagmail_handle.py b/common_utils/yagmail_handle.py index 0aa2c1c..511ef6c 100644 --- a/common_utils/yagmail_handle.py +++ b/common_utils/yagmail_handle.py @@ -37,7 +37,6 @@ class YagEmailServe: f"用户名: {self.user}\n" \ f"密码: {self.password}\n" \ f"host: {self.host}\n" \ - f"host: {self.host}\n" \ f"邮件内容: {info}\n" \ "=====================================================") yag = yagmail.SMTP( diff --git a/run.py b/run.py index c69b0a9..a9c6ebe 100644 --- a/run.py +++ b/run.py @@ -42,10 +42,10 @@ def run(env, m, report): # 捕获所有日志 logger.add(os.path.join(LOG_DIR, "runtime_{time}_all.log"), enqueue=True, encoding="utf-8", rotation="00:00", format="{time:YYYY-MM-DD HH:mm:ss} {level} From {module}.{function} : {message}") - # 仅捕获指定级别日志 - logger.add(os.path.join(LOG_DIR, "runtime_{time}.log"), enqueue=True, encoding="utf-8", rotation="00:00", - level=LOG_LEVEL.upper(), - format="{time:YYYY-MM-DD HH:mm:ss} {level} From {module}.{function} : {message}") + # # 仅捕获指定级别日志 + # logger.add(os.path.join(LOG_DIR, "runtime_{time}.log"), enqueue=True, encoding="utf-8", rotation="00:00", + # level=LOG_LEVEL.upper(), + # format="{time:YYYY-MM-DD HH:mm:ss} {level} From {module}.{function} : {message}") logger.info(""" _ _ _ _____ _ __ _ _ __ (_) / \\ _ _| |_ __|_ _|__ ___| |_ @@ -58,8 +58,9 @@ def run(env, m, report): # ------------------------ 设置全局变量 ------------------------ # 根据指定的环境参数，将运行环境所需相关配置数据保存到GLOBAL_VARS GLOBAL_VARS["env_key"] = env.lower() - for k, v in ENV_VARS[env.lower()].items(): - GLOBAL_VARS[k] = v + if ENV_VARS.get(env.lower(), None): + for k, v in ENV_VARS[env.lower()].items(): + GLOBAL_VARS[k] = v # ------------------------ 自动生成测试用例 ------------------------ # 删除原有的测试用例，以便生成新的测试用例 if os.path.exists(AUTO_CASE_DIR):