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

{pytest_api_framework_alpha-0.3.19 → 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.19
+Version: 0.3.20
 Author: alpha
 Author-email: 
 Requires-Python: >=3.6

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

@@ -7,7 +7,6 @@ from typing import Union
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 from urllib.parse import urlparse, urlunparse, urljoin
-from adodbapi.apibase import pythonTimeConverter
 
 import pytest
 from box import Box
@@ -189,17 +188,21 @@ class BaseTestCase(ExtendBaseTestCase):
         :return:
         """
         account_info = self.context.get(self.belong_app).get("accounts").get(account)
-        original_webhook_url = account_info.get("webhook_url")
-        if not original_webhook_url:
-            self.logger.warning(f"账号{account}未在context配置webhook地址")
-            return
+        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)
+                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"修改webhook地址异常: {e}")
+            self.logger.error(f"账号{account}修改webhook地址异常: {e}")
 
     def get_webhook(self, account, count=None, timeout=GET_WEBHOOK_TIMEOUT, interval=GET_WEBHOOK_TRIES):
         """
@@ -213,8 +216,9 @@ class BaseTestCase(ExtendBaseTestCase):
             """
         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}未在context配置webhook地址")
+            self.logger.warning(f"账号{account}未配置webhook地址")
             return
         webhook_url = webhook_url.replace("/webhook_vmock", "")
         base64_webhook_url = b64_encode(webhook_url.encode("utf8"))

{pytest_api_framework_alpha-0.3.19 → 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.19
+Version: 0.3.20
 Author: alpha
 Author-email: 
 Requires-Python: >=3.6

{pytest_api_framework_alpha-0.3.19 → 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.19",
+    version="0.3.20",
     packages=find_packages(),
     author="alpha",
     author_email="",