pytest-api-framework-alpha 0.3.6__tar.gz → 0.3.7__tar.gz

{pytest_api_framework_alpha-0.3.6 → pytest_api_framework_alpha-0.3.7}/PKG-INFO

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

{pytest_api_framework_alpha-0.3.6 → pytest_api_framework_alpha-0.3.7}/framework/base_class.py

@@ -64,7 +64,7 @@ class BaseTestCase(ExtendBaseTestCase):
             data = RenderData(data).render()
             data.request.url = self.replace_domain(data.request.url, domain)
             try:
-                self.response = getattr(app_http, account).request(data=data, kwargs=kwargs)
+                self.response = getattr(app_http, account).request(data=data, **kwargs)
             except AttributeError as e:
                 raise GetAccountError(e)
             if self.response.status_code in UNAUTHORIZED_CODE:
@@ -194,11 +194,77 @@ class BaseTestCase(ExtendBaseTestCase):
         """
         return set_customized_kytmock(self.context.get("env"), request_id, payment_type, risk_level, is_delayed)
 
-    def mock_mq_message(self,target_exchange,exchange_type,message,routing_key:str=None):
+    def mock_mq_message(self, target_exchange, exchange_type, message, routing_key: str = None):
         """
         target_exchange:目标交换机名称
         exchange_type：交换机类型，枚举：fanout，direct，topic，header
         message：消息体，json格式
         routing_key: 路由关键字，默认为null
         """
-        return  mock_mq(self.context.get("env"),target_exchange,exchange_type,message,routing_key)
+        return mock_mq(self.context.get("env"), target_exchange, exchange_type, message, routing_key)
+
+    def regenerate_hot_wallet_for_psp(self, participant_code):
+        """
+        
+        :param participant_code: partner或end-user的code
+        :return: 
+        """
+        # 删除wallet_service中的钱包
+        self.logger.info(f"重置{participant_code}热钱包")
+        wallet_service = self.mysql_conn(db=self.db.DB_WALLET_SERVICE)
+        wallet_service.execute(
+            f"delete from tbl_wallet_coin where wallet_key in (select wallet_key from tbl_wallet where participant_code='{participant_code}');")
+        wallet_service.execute(f"delete from tbl_wallet where  participant_code='{participant_code}';")
+        # 删除blockchain_service中的钱包
+        self.mysql_conn(self.db.DB_BLOCKCHAIN_SERVICE).execute(
+            f"delete from hot_wallethsm where participant_code='{participant_code}';")
+        # 删除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}';")
+
+        # 重新生成新钱包
+        self.post(
+            app="camp_admin",
+            account="admin",
+            url="/prod-api/crm/participant/createHotWallet.do",
+            json={"participantCode": participant_code}
+        )
+        assert self.response.code == 0
+
+    def regenerate_hot_wallet_for_buyer(self, partner_account, merchant_participant_code, buyer_participant_code):
+        """
+        
+        :param partner_account: partner账号
+        :param merchant_participant_code: merchant code
+        :param buyer_participant_code: buyer code
+        :return: 
+        """
+        # 删除wallet_service中的钱包
+        self.logger.info(f"重置{buyer_participant_code}热钱包")
+        wallet_service = self.mysql_conn(db=self.db.DB_WALLET_SERVICE)
+        wallet_service.execute(
+            f"delete from tbl_wallet_coin where wallet_key in (select wallet_key from tbl_wallet where participant_code='{buyer_participant_code}');")
+        wallet_service.execute(f"delete from tbl_wallet where  participant_code='{buyer_participant_code}';")
+        # 删除blockchain_service中的钱包
+        self.mysql_conn(self.db.DB_BLOCKCHAIN_SERVICE).execute(
+            f"delete from hot_wallethsm where participant_code='{buyer_participant_code}';")
+        # 删除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}';")
+
+        # 重新生成新钱包
+        self.post(
+            app="psp_api",
+            account=partner_account,
+            url="/v1.0/crm/deposit/createWallet",
+            json={
+                "participantCode": merchant_participant_code,
+                "buyerId": buyer_participant_code,
+                "expiry": 0
+            }
+        )
+        assert self.response.code == 200

{pytest_api_framework_alpha-0.3.6 → pytest_api_framework_alpha-0.3.7}/framework/conftest.py

@@ -25,6 +25,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.utils.lark_util import LarkUtil
 from framework.utils.yaml_util import CachedYamlLoader
 from framework.exceptions import MysqlDBError, RedisDBError
 from framework.global_attribute import CONTEXT, CONFIG, _FRAMEWORK_CONTEXT
@@ -522,11 +523,13 @@ def pytest_terminal_summary(terminalreporter, exitstatus, config):
     terminalreporter.write(f"用例通过率: {pass_rate}%\n", green=True, bold=True)
     terminalreporter.write("====================================\n", blue=True, bold=True)
     CONTEXT.set("summary", {
+        "total": total,
         "passed": passed,
         "failed": failed,
         "skipped": skipped,
-        "total": total,
+        "pass_rate": pass_rate
     })
+    # LarkUtil(settings.LARK_WEBHOOK).send_test_report(total=total, passed=passed, failed=failed, skipped=skipped)
 
 
 def pytest_exception_interact(node, call, report):
@@ -577,6 +580,7 @@ def inner_login(app):
         expire_time = datetime.now() + timedelta(seconds=token_expiry)
         _FRAMEWORK_CONTEXT.set(app=app, key="expire_time", value=expire_time)
 
+
 def login():
     def safe_call(func, name):
         try:

{pytest_api_framework_alpha-0.3.6 → pytest_api_framework_alpha-0.3.7}/framework/http_client.py

@@ -195,6 +195,7 @@ class HttpClient(object):
     def request(self, data, **kwargs):
         if data:
             try:
+                data["request"]["headers"].update(kwargs.get("headers", {}))
                 return self.__send_request(data)
             except Exception as e:
                 raise RequestException(e)

pytest_api_framework_alpha-0.3.7/framework/utils/lark_util.py

@@ -0,0 +1,71 @@
+import requests
+import json
+
+
+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\t**测试报告：**  👉 [点击查看测试报告]({report_url})"
+        return self.send_markdown("自动化测试结果", 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"
+    )

{pytest_api_framework_alpha-0.3.6 → pytest_api_framework_alpha-0.3.7}/pytest_api_framework_alpha.egg-info/PKG-INFO

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

{pytest_api_framework_alpha-0.3.6 → pytest_api_framework_alpha-0.3.7}/pytest_api_framework_alpha.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ framework/utils/__init__.py
 framework/utils/common.py
 framework/utils/date_util.py
 framework/utils/encrypt.py
+framework/utils/lark_util.py
 framework/utils/log_util.py
 framework/utils/mock_util.py
 framework/utils/yaml_util.py

{pytest_api_framework_alpha-0.3.6 → pytest_api_framework_alpha-0.3.7}/setup.py

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