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

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

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

pytest_api_framework_alpha-0.3.20/framework/assert_webhook.py

@@ -0,0 +1,78 @@
+import re
+from box import Box, BoxList
+from framework.utils.log_util import logger
+
+
+class AssertWebhook(object):
+
+    def __init__(self, webhook):
+        self.webhook_format = "dict"
+        if isinstance(webhook, dict):
+             self.webhook = Box(webhook)
+        elif isinstance(webhook, list):
+            self.webhook = BoxList(webhook)
+            self.webhook_format = "list"
+        else:
+            self.webhook = webhook
+            self.webhook_format = "other"
+
+    def assert_equal(self, expression, expected_result, desc=None):
+        """
+        校验webhook中的数据等于预期结果
+        :param expression:
+        :param expected_result:
+        :param desc:
+        :return:
+        """
+        if self.webhook_format == "other":
+            logger.warning(f"不支持非标准格式的webhook(json)校验")
+            return
+        practical_result = self.get_nested_value(self.webhook, expression)
+        logger.info(f"WEBHOOK断言: 断言类型: assert_equal, 断言结果: {practical_result} == {expected_result}")
+        assert practical_result == expected_result, f"{desc},实际结果: {practical_result}"
+        return self
+
+    def assert_is_null(self, expression, desc=None):
+        """
+        校验webhook中的数据等于预期结果
+        :param expression:
+        :param desc:
+        :return:
+        """
+        if self.webhook_format == "other":
+            logger.warning(f"不支持非标准格式的webhook(json)校验")
+            return
+        practical_result = self.get_nested_value(self.webhook, expression)
+        logger.info(f"WEBHOOK断言: 断言类型: assert_is_null, 断言结果: {practical_result}")
+        assert not practical_result, f"{desc},实际结果: {practical_result}"
+        return self
+
+    def assert_not_null(self, expression, desc=None):
+        """
+        校验webhook中的数据等于预期结果
+        :param expression:
+        :param desc:
+        :return:
+        """
+        if self.webhook_format == "other":
+            logger.warning(f"不支持非标准格式的webhook(json)校验")
+            return
+        practical_result = self.get_nested_value(self.webhook, expression)
+        logger.info(f"WEBHOOK断言: 断言类型: assert_not_null, 断言结果: {practical_result}")
+        assert practical_result is not None, f"{desc},实际结果: {practical_result}"
+        return self
+
+    @staticmethod
+    def get_nested_value(obj, attr_path):
+        """通过字符串路径（如 'a.b[0].c'）获取嵌套属性值"""
+        # 使用正则表达式分解路径，支持属性和索引的组合
+        path_elements = re.findall(r'(\w+)|\[(\d+)]', attr_path)
+        try:
+            for attr, index in path_elements:
+                if attr:  # 属性部分
+                    obj = getattr(obj, attr)
+                if index:  # 索引部分
+                    obj = obj[int(index)]
+            return obj
+        except Exception:
+            return None

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

@@ -1,3 +1,6 @@
+import uuid
+import time
+import json
 import traceback
 import importlib
 from typing import Union
@@ -15,6 +18,9 @@ from framework.utils.log_util import logger
 from framework.render_data import RenderData
 from framework.http_client import ResponseUtil
 from framework.utils.date_util import DateUtil
+from framework.retry_assert import RetryAssert
+from framework.assert_webhook import AssertWebhook
+from framework.utils.encrypt import b64_encode, b64_decode
 from framework.utils.common import snake_to_pascal, SingletonFaker
 from framework.global_attribute import GlobalAttribute, _FRAMEWORK_CONTEXT, CONTEXT
 from framework.exceptions import ValidateException, RenderException, RequestException, GetAccountError, GetAppHttpError
@@ -22,7 +28,7 @@ from framework.utils.mock_util import get_customized_kytmock, set_customized_kyt
     mock_mq
 
 from handlers.extend_base_test_case_attr import ExtendBaseTestCase
-from config.settings import UNAUTHORIZED_CODE, FAKER_LANGUAGE
+from config.settings import UNAUTHORIZED_CODE, FAKER_LANGUAGE, GET_WEBHOOK_TIMEOUT, GET_WEBHOOK_TRIES
 
 module = importlib.import_module("test_case.conftest")
 
@@ -39,6 +45,7 @@ class BaseTestCase(ExtendBaseTestCase):
     http = None
     data: Box = None
     belong_app = None
+    retry_assert = RetryAssert.eventually
     scenario: Scenario = None
     response: ResponseUtil = None
     context: Union[GlobalAttribute, Box] = None
@@ -64,6 +71,7 @@ class BaseTestCase(ExtendBaseTestCase):
             data = RenderData(data).render()
             data.request.url = self.replace_domain(data.request.url, domain)
             try:
+                self.set_webhook_url(account)
                 self.response = getattr(app_http, account).request(data=data, **kwargs)
             except AttributeError as e:
                 raise GetAccountError(e)
@@ -173,6 +181,90 @@ class BaseTestCase(ExtendBaseTestCase):
         )
         return urlunparse(updated_url)
 
+    def set_webhook_url(self, account):
+        """
+        修改webhook url地址，在原地址基础上拼接上/uuid,保证地址唯一
+        :param account: 账户名
+        :return:
+        """
+        account_info = self.context.get(self.belong_app).get("accounts").get(account)
+        info = self.mysql_conn("db_camp_crm").query(
+            f"SELECT webhook_url FROM tbl_participant WHERE participant_code = '{account_info.client_id}';",
+            log=False)
+        if not info:
+            # self.logger.warning(f"账号{account}未配置webhook地址")
+            return None
+        original_webhook_url = info.get("webhook_url").rsplit("/", 1)[0]
+        new_webhook_url = f"{original_webhook_url}/{str(uuid.uuid4()).replace("-", "_")}"
+        try:
+            self.mysql_conn("db_camp_crm").execute(
+                f"UPDATE tbl_participant set webhook_url = '{new_webhook_url}' WHERE participant_code = '{account_info.client_id}';",
+                log=False)
+            self.context_set(f"{account_info.client_id}_webhook", urlparse(new_webhook_url).path)
+        except Exception as e:
+            self.logger.error(f"账号{account}修改webhook地址异常: {e}")
+
+    def get_webhook(self, account, count=None, timeout=GET_WEBHOOK_TIMEOUT, interval=GET_WEBHOOK_TRIES):
+        """
+            获取 webhook 日志，若为空则重试
+
+            :param account: 账户名
+            :param count: 期望日志条数（None 表示只要非空即可）
+            :param timeout: 最大等待时间（秒）
+            :param interval: 重试间隔（秒）
+            :return: webhook 日志列表 or []
+            """
+        account_info = self.context.get(self.belong_app).get("accounts").get(account)
+        webhook_url = self.context_get(f"{account_info.client_id}_webhook")
+
+        if not webhook_url:
+            self.logger.warning(f"账号{account}未配置webhook地址")
+            return
+        webhook_url = webhook_url.replace("/webhook_vmock", "")
+        base64_webhook_url = b64_encode(webhook_url.encode("utf8"))
+        self.logger.info(f'原始webhook_url: {webhook_url}, base64格式webhook_url: {base64_webhook_url}')
+
+        redis_key = f"vmock_webhook_log:{base64_webhook_url}"
+        redis = self.redis_conn(db="database")
+        end_time = time.time() + timeout
+        webhook_list = []
+        while time.time() < end_time:
+            webhook_list = redis.lrange_all(redis_key)
+            if webhook_list:
+                webhook_list = [
+                    json.loads(raw[raw.find(b"{"):].decode("utf-8"))
+                    for raw in webhook_list
+                    if isinstance(raw, (bytes, bytearray)) and raw.find(b"{") != -1
+                ]
+                current_count = len(webhook_list)
+                if count is None:
+                    self.logger.info(f"成功获取webhook{current_count}条: {json.dumps(webhook_list)}")
+                    redis.lpop_all(redis_key)
+                    return webhook_list
+
+                if current_count == count:
+                    self.logger.info(f"成功获取webhook{current_count}条: {json.dumps(webhook_list)}")
+                    redis.lpop_all(redis_key)
+                    return webhook_list
+
+                self.logger.info(f"已获取webhook {current_count} 条,未达到预期 {count} 条,5 秒后重试...")
+            else:
+                self.logger.info(f"暂未收到webhook,{interval} 秒后重试...")
+            time.sleep(interval)
+        current_count = len(webhook_list)
+        if current_count == 0:
+            self.logger.warning(f"等待webhook超时({GET_WEBHOOK_TIMEOUT} 秒),redis key: {redis_key}")
+            raise AssertionError('暂未收到webhook')
+        else:
+            self.logger.info(f"已获取部分webhook: {json.dumps(webhook_list)}")
+            if count:
+                raise AssertionError(f'webhook条数错误,当前条数: {current_count} 期望条数: {count}')
+            redis.lpop_all(redis_key)
+            return webhook_list
+
+    def webhook(self, webhook):
+        return AssertWebhook(webhook)
+
     def get_customized_kytmock(self, request_id):
         return get_customized_kytmock(self.context.get("env"), request_id)
 
@@ -222,7 +314,8 @@ class BaseTestCase(ExtendBaseTestCase):
         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 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}';")
+        crm.execute(
+            f"delete from tbl_participant_crypto_wallet where wallet_tag ='MY HOT WALLET' and participant_code='{participant_code}';")
 
         # 重新生成新钱包
         self.post(
@@ -254,7 +347,8 @@ class BaseTestCase(ExtendBaseTestCase):
         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 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}';")
+        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.18 → pytest_api_framework_alpha-0.3.20}/framework/conftest.py

@@ -27,6 +27,7 @@ from framework.exit_code import ExitCode
 from framework.db.mysql_db import MysqlDB
 from framework.db.redis_db import RedisDB
 from framework.utils.log_util import logger
+from framework.retry_assert import RetryAssert
 from framework.utils.lark_util import LarkUtil
 from framework.utils.yaml_util import CachedYamlLoader
 from framework.exceptions import MysqlDBError, RedisDBError
@@ -392,6 +393,7 @@ def pytest_runtest_setup(item):
     if item.funcargs.get("first"):
         test_object = item.instance
         test_object.context = CONTEXT
+        test_object.retry_assert = RetryAssert.eventually
         test_object.config = CONFIG
         test_object.http = _FRAMEWORK_CONTEXT.get(key="_http")
         data = item.callspec.params.get("data")
@@ -456,6 +458,7 @@ def pytest_runtest_call(item):
     item.funcargs["belong_app"] = item.instance.belong_app = _belong_app
     item.funcargs["config"] = item.instance.config = CONFIG
     item.funcargs["context"] = item.instance.context = CONTEXT
+    item.funcargs["retry_assert"] = item.instance.retry_assert = RetryAssert.eventually
     # 类式测试用例添加参数http，data, belong_app
     item.instance.http = http
 
@@ -477,6 +480,7 @@ def pytest_runtest_teardown(item):
         test_object = item.instance
         test_object.context = CONTEXT
         test_object.config = CONFIG
+        test_object.retry_assert = RetryAssert.eventually
         test_object.http = _FRAMEWORK_CONTEXT.get(key="_http")
         data = item.callspec.params.get("data")
         test_object.data = Box(data)
@@ -553,7 +557,7 @@ def pytest_terminal_summary(terminalreporter, exitstatus, config):
         passed=passed,
         failed=failed,
         skipped=skipped,
-        job_name=os.environ.get("JOB_NAME"),
+        job_name=CONTEXT.get("mark"),
         env=CONTEXT.get("env")
     )
 

{pytest_api_framework_alpha-0.3.18 → pytest_api_framework_alpha-0.3.20}/framework/db/redis_db.py

@@ -101,6 +101,12 @@ class RedisDB:
             items.append(val)
         return items
 
+    @safe_redis_call
+    def lrange_all(self, name):
+        """弹出并返回队列中所有元素（不会清空队列）"""
+        res = self.conn.lrange(name, 0, -1)
+        return res if res else []
+
     # -------------------- meta --------------------
     @safe_redis_call
     def set_ttl(self, name, ttl, log=True):
@@ -139,4 +145,4 @@ class RedisDB:
 
     @safe_redis_call
     def rpop(self, name):
-        return self.conn.rpop(name)
+        return self.conn.rpop(name)

pytest_api_framework_alpha-0.3.20/framework/retry_assert.py

@@ -0,0 +1,58 @@
+import time
+import traceback
+from framework.utils.log_util import logger
+from config.settings import ASYNC_ASSERT_TRIES, ASYNC_ASSERT_TIMEOUT
+
+
+class RetryAssert:
+    @staticmethod
+    def eventually(
+            assert_func,
+            *args,
+            timeout=ASYNC_ASSERT_TIMEOUT,
+            interval=ASYNC_ASSERT_TRIES,
+            desc=None,
+            **kwargs
+    ):
+        """
+        在超时时间内不断重试断言，直到成功或超时
+
+        :param assert_func: 断言函数
+        :param args: 传给断言函数的位置参数
+        :param kwargs: 传给断言函数的关键字参数
+        """
+        start = time.time()
+        last_exception = None
+        attempt = 0
+
+        while True:
+            attempt += 1
+            elapsed = time.time() - start
+
+            if elapsed > timeout:
+                break
+
+            try:
+                assert_func(*args, **kwargs)
+                return
+            except AssertionError as e:
+                last_exception = e
+                logger.warning(
+                    f"第 {attempt} 次断言失败 "
+                    f"(已等待 {elapsed:.1f}s / {timeout}s): {e}"
+                )
+            except Exception as e:
+                last_exception = e
+                logger.warning(
+                    f"第 {attempt} 次执行异常 "
+                    f"(已等待 {elapsed:.1f}s / {timeout}s): {e}"
+                )
+
+            time.sleep(interval)
+
+        error_msg = desc or "异步断言失败"
+        raise AssertionError(
+            f"{error_msg}\n"
+            f"重试次数: {attempt}\n"
+            f"最后异常: {last_exception}"
+        )

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

@@ -74,7 +74,7 @@ class LarkUtil:
         except ZeroDivisionError:
             pass_rate = 0
         markdown = f"""**执行环境：** {env}
-**执行命令：** {command}
+**执行标签：** {command}
 **执行完成时间：** {datetime.now().strftime("%Y-%m-%d %X")}
 **执行用例总数：** {total}
 **通过用例数：** {passed}

{pytest_api_framework_alpha-0.3.18 → pytest_api_framework_alpha-0.3.20}/framework/validate.py

@@ -115,7 +115,7 @@ class Validate(object):
 
     def assert_equal(self, expectant_expression, practical_result):
         expectant_result = self.parse_expectant_expression(expectant_expression)
-        if isinstance(expectant_result, (int, float)) and isinstance(practical_result, str):
+        if isinstance(expectant_result, (int, float)) or isinstance(practical_result, str):
             if isinstance(practical_result, str) and practical_result.startswith("${") and practical_result.endswith(
                     "}"):
                 practical_result = RenderData(self.data).get_attribute(practical_result[2:-1])
@@ -126,7 +126,7 @@ class Validate(object):
 
     def assert_not_equal(self, expectant_expression, practical_result):
         expectant_result = self.parse_expectant_expression(expectant_expression)
-        if isinstance(expectant_result, (int, float)) and isinstance(practical_result, str):
+        if isinstance(expectant_result, (int, float)) or isinstance(practical_result, str):
             if isinstance(practical_result, str) and practical_result.startswith("${") and practical_result.endswith(
                     "}"):
                 practical_result = RenderData(self.data).get_attribute(practical_result[2:-1])
@@ -267,7 +267,7 @@ class Validate(object):
 
     def assert_is_null(self, expectant_expression, practical_result):
         expectant_result = self.parse_expectant_expression(expectant_expression)
-        assert expectant_result is None
+        assert not expectant_result
         return expectant_result
 
     def assert_is_not_null(self, expectant_expression, practical_result):

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

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

{pytest_api_framework_alpha-0.3.18 → pytest_api_framework_alpha-0.3.20}/pytest_api_framework_alpha.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 setup.py
 framework/__init__.py
+framework/assert_webhook.py
 framework/base_class.py
 framework/conftest.py
 framework/exceptions.py
@@ -9,6 +10,7 @@ framework/global_attribute.py
 framework/http_client.py
 framework/render_data.py
 framework/report.py
+framework/retry_assert.py
 framework/script.py
 framework/startapp.py
 framework/validate.py

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

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