pytest-api-framework-alpha 0.3.12__tar.gz → 0.3.14__tar.gz

{pytest_api_framework_alpha-0.3.12 → pytest_api_framework_alpha-0.3.14}/PKG-INFO

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

{pytest_api_framework_alpha-0.3.12 → pytest_api_framework_alpha-0.3.14}/framework/base_class.py

@@ -162,7 +162,7 @@ class BaseTestCase(ExtendBaseTestCase):
         :param new_base: 新的 base，如 'https://new.example.com'
         :return: 替换后的 URL
         """
-        if url.startswith("http"):
+        if url.startswith("http") and "mce.sg" not in url:
             return url
         parsed_url = urlparse(url)
         new_base_parsed = urlparse(new_base)
@@ -205,9 +205,9 @@ class BaseTestCase(ExtendBaseTestCase):
 
     def regenerate_hot_wallet_for_psp(self, participant_code):
         """
-        
+
         :param participant_code: partner或end-user的code
-        :return: 
+        :return:
         """
         # 删除wallet_service中的钱包
         self.logger.info(f"重置{participant_code}热钱包")
@@ -235,7 +235,7 @@ class BaseTestCase(ExtendBaseTestCase):
 
     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

{pytest_api_framework_alpha-0.3.12 → pytest_api_framework_alpha-0.3.14}/framework/conftest.py

@@ -279,9 +279,10 @@ def pytest_generate_tests(metafunc):
 
 
 def pytest_collection_modifyitems(items):
+    # 过滤掉不在收集范围的case
+    items = [item for item in items if getattr(item, "callspec", None)]
     # 重新排序
     new_items = sort(items)
-    # Demo: new_items = [items[0],items[2],items[1],items[3]]
     items[:] = new_items
     for item in items:
         # 获取mark标记
@@ -292,6 +293,8 @@ def pytest_collection_modifyitems(items):
                 item.add_marker(mark)
 
 
+
+
 def pytest_collection_finish(session):
     """获取最终排序后的 items 列表"""
     logger.info(f"共收集到 {len(session.items)} 个测试用例")
@@ -800,11 +803,9 @@ def sort(case_items):
         # 生成每个组当前的索引
         ori_name_temp = None
         ori_name_list = []
-
         for item in non_custom_scope_items:
             clase_id = item.cls.__name__
             original_name = item.originalname
-
             if ori_name_temp is None or ori_name_temp == original_name:
                 ori_name_temp = original_name
                 case_suite_num += 1

{pytest_api_framework_alpha-0.3.12 → pytest_api_framework_alpha-0.3.14}/framework/db/mysql_db.py

@@ -139,8 +139,14 @@ class MysqlDB:
 
     @staticmethod
     def custom_serializer(obj):
-        if isinstance(obj, datetime):
-            return obj.strftime('%Y-%m-%d %H:%M:%S')  # 转换时间格式
-        elif isinstance(obj, Decimal):
-            return float(obj)  # 转换 Decimal 为 float
-        raise TypeError(f"Type {type(obj)} not serializable")
+        try:
+            if isinstance(obj, datetime):
+                return obj.strftime('%Y-%m-%d %H:%M:%S')
+            elif isinstance(obj, Decimal):
+                return float(obj)
+            elif isinstance(obj, bytes):
+                return obj.decode(errors='ignore', encoding='utf-8')
+            # 不处理的类型：直接返回原对象
+            return obj
+        except Exception:
+            return obj

{pytest_api_framework_alpha-0.3.12 → pytest_api_framework_alpha-0.3.14}/pytest_api_framework_alpha.egg-info/PKG-INFO

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

{pytest_api_framework_alpha-0.3.12 → pytest_api_framework_alpha-0.3.14}/setup.py

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