pytest-api-framework-alpha 0.3.9__tar.gz → 0.3.10__tar.gz

{pytest_api_framework_alpha-0.3.9 → pytest_api_framework_alpha-0.3.10}/PKG-INFO

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

{pytest_api_framework_alpha-0.3.9 → pytest_api_framework_alpha-0.3.10}/framework/conftest.py

@@ -207,14 +207,14 @@ def pytest_generate_tests(metafunc):
     if scenarios:
         ids = list()
         for index, item in enumerate(scenarios):
-            if item.get("scenario").get("ignore"):
-                continue
-            if func_name in item.get("scenario").get("exclude", list()):
-                continue
             scenario = item.get("scenario")
             level = scenario.get("level", settings.DEFAULT_CASE_LEVEL).lower()
-
             case_data["level"] = level
+            if scenario.get("ignore"):
+                continue
+            if func_name in scenario.get("exclude", list()):
+                continue
+
             new_marks = marks.copy()
             new_marks.append(level)
             # mark标记
@@ -247,11 +247,10 @@ def pytest_generate_tests(metafunc):
                 logger.error(f"scenario参数化格式不正确:{e}")
                 traceback.print_exc()
                 pytest.exit(ExitCode.SCENARIO_FORMAT_ERROR)
+        if case_data_list:
+            metafunc.parametrize("data", case_data_list, ids=ids, scope="function")
 
-        metafunc.parametrize("data", case_data_list, ids=ids, scope="function")
     else:
-        if case_common.get("ignore"):
-            return
         case_data["_scenario"] = {"data": {}}
         case_data["_ignore_failed"] = case_common.get("ignore_failed", settings.GLOBAL_IGNORE_FAILED)
         level = case_data.get("level", settings.DEFAULT_CASE_LEVEL)
@@ -524,13 +523,18 @@ def pytest_terminal_summary(terminalreporter, exitstatus, config):
     terminalreporter.write(f"跳过用例数: {skipped}\n", yellow=True, bold=True)
     terminalreporter.write(f"用例通过率: {pass_rate}%\n", green=True, bold=True)
     terminalreporter.write("====================================\n", blue=True, bold=True)
-    if "linux" in platform.platform().lower():
-        LarkUtil(settings.LARK_WEBHOOK).send_test_report(
+    if settings.ONLY_LINUX_NOTIFICATION:
+        if "linux" not in platform.platform().lower():
+            return
+    for webhook in settings.LARK_WEBHOOKS:
+        LarkUtil(webhook).send_test_report(
             total=total,
             passed=passed,
             failed=failed,
             skipped=skipped,
-            report_url=os.environ.get("ALLURE_REPORT_URL")
+            report_url=os.environ.get("ALLURE_REPORT_URL"),
+            job_name=os.environ.get("JOB_NAME"),
+            env=CONTEXT.get("env")
         )
 
 
@@ -811,28 +815,30 @@ def sort(case_items):
 
         # 根据组数 创建各组的数组 并插入第一个case
         case_dict = dict()
-        try:
-            for i in range(case_suite_num):
+
+        for i in range(case_suite_num):
+            try:
                 item = ori_name_list[i][1]
                 id = item.callspec.id
 
                 first_part = id.split('#', 1)[-1]
                 index = first_part.split(']')[0]
                 case_dict[index] = [item]
-        except:
-            pass
+            except Exception as e:
+                continue
 
         new_start_index = case_suite_num
         # 以new_start_index为起点 重新遍历items
-        try:
-            for i in range(new_start_index, len(non_custom_scope_items)):
+
+        for i in range(new_start_index, len(non_custom_scope_items)):
+            try:
                 item = non_custom_scope_items[i]
                 id = item.callspec.id
                 first_part = id.split('#', 1)[-1]
                 index = first_part.split(']')[0]
                 case_dict.get(index).append(item)
-        except:
-            pass
+            except Exception as e:
+                continue
 
         index = 0
         for id in case_dict:

pytest_api_framework_alpha-0.3.10/framework/utils/lark_util.py

@@ -0,0 +1,87 @@
+import base64
+import hmac
+import hashlib
+import time
+from datetime import datetime
+
+import json
+import requests
+
+
+class LarkUtil:
+    def __init__(self, webhook: dict):
+        self.webhook = webhook
+        self.url = self.webhook.get("url")
+        self.secret = self.webhook.get("secret")
+        self.at_ids = self.webhook.get("open_ids") or None
+        self.headers = {"Content-Type": "application/json"}
+
+    @staticmethod
+    def gen_sign(timestamp, secret):
+        """生成HMAC签名"""
+        # 拼接timestamp和secret
+        string_to_sign = '{}\n{}'.format(timestamp, secret)
+        hmac_code = hmac.new(string_to_sign.encode("utf-8"), digestmod=hashlib.sha256).digest()
+        # 对结果进行base64处理
+        sign = base64.b64encode(hmac_code).decode('utf-8')
+        return sign
+
+    def send_text(self, text: str, at_ids: list[str] = None):
+        data = {
+            "msg_type": "text",
+            "content": {"text": text},
+        }
+        if at_ids:
+            data["at"] = {"open_ids": at_ids}
+        if self.secret:
+            timestamp = str(int(time.time()))
+            data["sign"] = LarkUtil.gen_sign(timestamp, self.secret)
+            data["timestamp"] = timestamp
+
+        return requests.post(self.url, data=json.dumps(data), headers=self.headers)
+
+    def send_markdown(self, title: str, markdown_text: str, at_ids: list[str] = None):
+        """发送 Markdown 消息"""
+
+        data = {
+            "msg_type": "interactive",
+            "card": {
+                "header": {
+                    "template": "blue",
+                    "title": {"tag": "plain_text", "content": title}
+                },
+                "elements": [
+                    {
+                        "tag": "markdown",
+                        "content": markdown_text
+                    }
+                ]
+            }
+        }
+        if at_ids:
+            data["at"] = {"open_ids": at_ids}
+        if self.secret:
+            timestamp = str(int(time.time()))
+            data["sign"] = LarkUtil.gen_sign(timestamp, self.secret)
+            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):
+        """自动化测试结果消息（Markdown）"""
+        try:
+            pass_rate = round(passed / (total - skipped) * 100, 2)
+        except ZeroDivisionError:
+            pass_rate = 0
+        markdown = f"""**执行环境：** {env}
+**执行完成时间：** {datetime.now().strftime("%Y-%m-%d %X")}
+**执行用例总数：** {total}
+**通过用例数：** {passed}
+**失败用例数：** {failed}
+**跳过用例数：** {skipped}
+**用例通过率：** {pass_rate}%
+            """
+        if report_url:
+            markdown += f"\n**测试报告：** [点击查看测试报告]({report_url})"
+        title = f"【自动化测试结果】-{job_name} " if job_name else "【自动化测试结果】"
+        return self.send_markdown(title, markdown)

{pytest_api_framework_alpha-0.3.9 → pytest_api_framework_alpha-0.3.10}/pytest_api_framework_alpha.egg-info/PKG-INFO

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

{pytest_api_framework_alpha-0.3.9 → pytest_api_framework_alpha-0.3.10}/setup.py

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

pytest_api_framework_alpha-0.3.9/framework/utils/lark_util.py

@@ -1,70 +0,0 @@
-import requests
-import json
-from datetime import datetime
-
-class LarkUtil:
-    def __init__(self, webhook: str):
-        self.webhook = webhook
-        self.headers = {"Content-Type": "application/json"}
-
-    def send_text(self, text: str, at_ids=None):
-        data = {
-            "msg_type": "text",
-            "content": {"text": text},
-        }
-        if at_ids:
-            data["at"] = {"open_ids": at_ids}
-        return requests.post(self.webhook, data=json.dumps(data), headers=self.headers)
-
-    def send_markdown(self, title: str, markdown_text: str):
-        """发送 Markdown 消息"""
-
-        data = {
-            "msg_type": "interactive",
-            "card": {
-                "header": {
-                    "template": "blue",
-                    "title": {"tag": "plain_text", "content": title}
-                },
-                "elements": [
-                    {
-                        "tag": "markdown",
-                        "content": markdown_text
-                    }
-                ]
-            }
-        }
-
-        resp = requests.post(self.webhook, headers=self.headers, data=json.dumps(data))
-        return resp.text
-
-    def send_test_report(self, total: int, passed: int, failed: int, skipped: int, report_url: str = None):
-        """自动化测试结果消息（Markdown）"""
-        try:
-            pass_rate = round(passed / (total - skipped) * 100, 2)
-        except ZeroDivisionError:
-            pass_rate = 0
-        markdown = f"""**执行结果统计：**  
-**执行用例总数：** {total}
-**通过用例数：** {passed}
-**失败用例数：** {failed}
-**跳过用例数：** {skipped}
-**用例通过率：** {pass_rate}%
-            """
-        if report_url:
-            markdown += f"\n**测试报告：**  👉 [点击查看测试报告]({report_url})"
-        return self.send_markdown(f"自动化测试结果  {datetime.now().strftime("%Y-%m-%d %X")}", markdown)
-
-
-if __name__ == "__main__":
-    # 你的飞书群机器人 Webhook URL
-    WEBHOOK = "https://open.larksuite.com/open-apis/bot/v2/hook/27de2bf2-fa0d-49e7-8ff3-a3e3ad8cf2d7"
-    bot = LarkUtil(WEBHOOK)
-
-    bot.send_test_report(
-        total=20,
-        passed=18,
-        failed=1,
-        skipped=1,
-        report_url="http://your-report/index.html"
-    )