pytest-api-framework-alpha 0.3.15__tar.gz → 0.3.18__tar.gz

{pytest_api_framework_alpha-0.3.15 → pytest_api_framework_alpha-0.3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-api-framework-alpha
-Version: 0.3.15
+Version: 0.3.18
 Author: alpha
 Author-email: 
 Requires-Python: >=3.6

{pytest_api_framework_alpha-0.3.15 → pytest_api_framework_alpha-0.3.18}/framework/base_class.py

@@ -43,7 +43,7 @@ class BaseTestCase(ExtendBaseTestCase):
     response: ResponseUtil = None
     context: Union[GlobalAttribute, Box] = None
     config: Union[GlobalAttribute, Box] = None
-    # faker方法文档 https://blog.csdn.net/m0_60052979/article/details/126368024
+    # faker方法文档 https://hellopython.readthedocs.io/zh-cn/latest/faker_generate_fake_data.html
     faker: Faker = SingletonFaker(locale=FAKER_LANGUAGE).faker
     env = CONTEXT.get("env")
     logger: logger = logger
@@ -221,8 +221,8 @@ class BaseTestCase(ExtendBaseTestCase):
         # 删除crm中钱包
         crm = self.mysql_conn(db=self.db.DB_CAMP_CRM)
         crm.execute(
-            f"delete from tbl_crypto_wallet where id in (select wallet_id from tbl_participant_crypto_wallet where participant_code='{participant_code}');")
-        crm.execute(f"delete from tbl_participant_crypto_wallet where participant_code='{participant_code}';")
+            f"delete from tbl_crypto_wallet where id in (select wallet_id from tbl_participant_crypto_wallet where wallet_tag ='MY HOT WALLET' and participant_code='{participant_code}');")
+        crm.execute(f"delete from tbl_participant_crypto_wallet where wallet_tag ='MY HOT WALLET' and participant_code='{participant_code}';")
 
         # 重新生成新钱包
         self.post(
@@ -253,8 +253,8 @@ class BaseTestCase(ExtendBaseTestCase):
         # 删除crm中钱包
         crm = self.mysql_conn(db=self.db.DB_CAMP_CRM)
         crm.execute(
-            f"delete from tbl_crypto_wallet where id in (select crypto_wallet_id from tbl_buyer_crypto_wallet where participant_code='{buyer_participant_code}');")
-        crm.execute(f"delete from tbl_buyer_crypto_wallet where participant_code='{buyer_participant_code}';")
+            f"delete from tbl_crypto_wallet where id in (select crypto_wallet_id from tbl_buyer_crypto_wallet where wallet_tag ='MY HOT WALLET' and participant_code='{buyer_participant_code}');")
+        crm.execute(f"delete from tbl_buyer_crypto_wallet where wallet_tag ='MY HOT WALLET' and participant_code='{buyer_participant_code}';")
 
         # 重新生成新钱包
         self.post(

{pytest_api_framework_alpha-0.3.15 → pytest_api_framework_alpha-0.3.18}/framework/conftest.py

@@ -128,7 +128,9 @@ def pytest_generate_tests(metafunc):
         # pytest.exit(ExitCode.CASE_YAML_NOT_EXIST)
     # yml转json
     test_data = CachedYamlLoader(data_path).load_yml()
-
+    if not test_data:
+        logger.warning(f"测试数据文件: {func_file_path} 内容为空")
+        return
     # 测试用例公共数据
     case_common = test_data.get("case_common")
     # 忽略的用例直接跳过
@@ -296,13 +298,14 @@ def pytest_collection_modifyitems(items):
                 for mark in marks:
                     item.add_marker(mark)
 
+
 def pytest_collection_finish(session):
     """获取最终排序后的 items 列表"""
-    logger.info(f"共收集到 {len(session.items)} 个测试用例")
     if not session.items:
         pytest.exit("未收集到用例")
     # 过滤掉item名称是test_setup或test_teardown的
     session.items = [item for item in session.items if item.name not in ["test_setup", "test_teardown"]]
+    logger.info(f"共收集到 {len(session.items)} 个测试用例")
 
     # 1. 筛选出带井号 名称带'#' 的item，并记录原始索引
     hash_items_with_index = [(index, item) for index, item in enumerate(session.items) if "#" in item.name]
@@ -532,6 +535,7 @@ def pytest_terminal_summary(terminalreporter, exitstatus, config):
     if settings.ONLY_LINUX_NOTIFICATION:
         if "linux" not in platform.platform().lower():
             return
+    # 发送测试结果群消息
     for webhook in settings.LARK_WEBHOOKS.get(CONTEXT.get("env")):
         LarkUtil(webhook).send_test_report(
             total=total,
@@ -540,8 +544,19 @@ def pytest_terminal_summary(terminalreporter, exitstatus, config):
             skipped=skipped,
             report_url=os.environ.get("ALLURE_REPORT_URL"),
             job_name=os.environ.get("JOB_NAME"),
-            env=CONTEXT.get("env")
+            env=CONTEXT.get("env"),
+            command=CONTEXT.get("command")
         )
+    # 发送测试结果统计
+    LarkUtil(settings.LARK_CHART_WEBHOOK).send_test_chart(
+        total=total,
+        passed=passed,
+        failed=failed,
+        skipped=skipped,
+        job_name=os.environ.get("JOB_NAME"),
+        env=CONTEXT.get("env")
+    )
+
 
 def pytest_exception_interact(node, call, report):
     """

{pytest_api_framework_alpha-0.3.15 → pytest_api_framework_alpha-0.3.18}/framework/utils/lark_util.py

@@ -66,14 +66,15 @@ class LarkUtil:
             data["timestamp"] = timestamp
         return requests.post(self.url, headers=self.headers, data=json.dumps(data))
 
-    def send_test_report(self, total: int, passed: int, failed: int, skipped: int, report_url: str = None,
-                         job_name: str = None, env=None):
+    def send_test_report(self, total: int, passed: int, failed: int, skipped: int, env: str, job_name: str,
+                         command: str, report_url: str = None):
         """自动化测试结果消息（Markdown）"""
         try:
             pass_rate = round(passed / (total - skipped) * 100, 2)
         except ZeroDivisionError:
             pass_rate = 0
         markdown = f"""**执行环境：** {env}
+**执行命令：** {command}
 **执行完成时间：** {datetime.now().strftime("%Y-%m-%d %X")}
 **执行用例总数：** {total}
 **通过用例数：** {passed}
@@ -84,4 +85,16 @@ class LarkUtil:
         if report_url:
             markdown += f"\n**测试报告：** [点击查看测试报告]({report_url})"
         title = f"【自动化测试结果】-{job_name} " if job_name else "【自动化测试结果】"
-        return self.send_markdown(title, markdown)
+        return self.send_markdown(title, markdown)
+
+    def send_test_chart(self, total: int, passed: int, failed: int, skipped: int, job_name: str, env: str):
+
+        return requests.post(self.url, headers=self.headers,
+                             json={
+                                 "job": job_name,
+                                 "total": total,
+                                 "passed": passed,
+                                 "failed": failed,
+                                 "skiped": skipped,
+                                 "env": env
+                             })

{pytest_api_framework_alpha-0.3.15 → pytest_api_framework_alpha-0.3.18}/pytest_api_framework_alpha.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-api-framework-alpha
-Version: 0.3.15
+Version: 0.3.18
 Author: alpha
 Author-email: 
 Requires-Python: >=3.6

{pytest_api_framework_alpha-0.3.15 → pytest_api_framework_alpha-0.3.18}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pytest-api-framework-alpha",  # 包名（必须唯一）
-    version="0.3.15",
+    version="0.3.18",
     packages=find_packages(),
     author="alpha",
     author_email="",