pytest-api-framework-alpha 0.3.21__tar.gz → 0.3.23__tar.gz

{pytest_api_framework_alpha-0.3.21 → pytest_api_framework_alpha-0.3.23}/PKG-INFO

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

{pytest_api_framework_alpha-0.3.21 → pytest_api_framework_alpha-0.3.23}/framework/base_class.py

@@ -16,10 +16,10 @@ from framework.db.redis_db import RedisDB
 from framework.db.mysql_db import MysqlDB
 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.http_client import ResponseUtil, HttpClient
 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
@@ -60,7 +60,7 @@ class BaseTestCase(ExtendBaseTestCase):
     risk_level: RiskLevel = RiskLevel
     is_delayed: IsDelayed = IsDelayed
 
-    def request(self, app=None, *, account, data, **kwargs) -> ResponseUtil:
+    def request(self, app=None, account="", *, data, **kwargs) -> ResponseUtil:
         try:
             app = self.default_app(app)
             try:
@@ -71,8 +71,7 @@ class BaseTestCase(ExtendBaseTestCase):
             data = RenderData(data).render()
             data.request.url = self.replace_domain(data.request.url, domain)
             try:
-                self.set_webhook_url(app, account)
-                self.response = getattr(app_http, account).request(data=data, **kwargs)
+                self.response = getattr(app_http, account, HttpClient()).request(data=data, **kwargs)
             except AttributeError as e:
                 raise GetAccountError(e)
             if self.response.status_code in UNAUTHORIZED_CODE:
@@ -181,23 +180,24 @@ class BaseTestCase(ExtendBaseTestCase):
         )
         return urlunparse(updated_url)
 
-    def set_webhook_url(self, app, account):
+    def set_webhook_url(self, account, app=None):
         """
         修改webhook url地址，在原地址基础上拼接上/uuid,保证地址唯一
-        :param app:
         :param account: 账户名
+        :param app:
         :return:
         """
+        app = self.default_app(app)
         account_info = self.context.get(app).get("accounts").get(account)
         try:
             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:
+            if not info.get("webhook_url"):
                 # self.logger.warning(f"账号{account}未配置webhook地址")
-                return None
+                return self
         except Exception as e:
-            return None
+            return self
         original_webhook_url = info.get("webhook_url").rsplit("/", 1)[0]
         new_webhook_url = f"{original_webhook_url}/{str(uuid.uuid4()).replace("-", "_")}"
         try:
@@ -207,6 +207,7 @@ class BaseTestCase(ExtendBaseTestCase):
             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}")
+        return self
 
     def get_webhook(self, account, count=None, timeout=GET_WEBHOOK_TIMEOUT, interval=GET_WEBHOOK_TRIES):
         """
@@ -336,7 +337,7 @@ class BaseTestCase(ExtendBaseTestCase):
         :param partner_account: partner账号
         :param merchant_participant_code: merchant code
         :param buyer_participant_code: buyer code
-        :return: 
+        :return:
         """
         # 删除wallet_service中的钱包
         self.logger.info(f"重置{buyer_participant_code}热钱包")

{pytest_api_framework_alpha-0.3.21 → pytest_api_framework_alpha-0.3.23}/framework/retry_assert.py

@@ -33,8 +33,7 @@ class RetryAssert:
                 break
 
             try:
-                assert_func(*args, **kwargs)
-                return
+                return assert_func(*args, **kwargs)
             except AssertionError as e:
                 last_exception = e
                 logger.warning(

{pytest_api_framework_alpha-0.3.21 → pytest_api_framework_alpha-0.3.23}/pytest_api_framework_alpha.egg-info/PKG-INFO

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

{pytest_api_framework_alpha-0.3.21 → pytest_api_framework_alpha-0.3.23}/setup.py

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