pytest-api-framework-alpha 0.1.8__tar.gz → 0.2.0__tar.gz

{pytest_api_framework_alpha-0.1.8 → pytest_api_framework_alpha-0.2.0}/PKG-INFO

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

{pytest_api_framework_alpha-0.1.8 → pytest_api_framework_alpha-0.2.0}/framework/base_class.py

@@ -33,6 +33,7 @@ class BaseTestCase(object):
             app_http = getattr(self.http, app)
             domain = self.context.get(app).get("domain")
             data = RenderData(data).render()
+            url = data.request.get("url")
             data.request.url = self.replace_domain(data.request.url, domain)
             self.response = getattr(app_http, account).request(data=data, kwargs=kwargs)
             if self.response.status_code in UNAUTHORIZED_CODE:
@@ -60,9 +61,9 @@ class BaseTestCase(object):
         request.update({"method": "get", "headers": {}, **kwargs})
         return self.request(app=app, account=account, data=Box({"request": request}))
 
-    def put(self, app, account, url, data=None, **kwargs):
+    def put(self, app, account, url, data=None, json=None, **kwargs):
         domain = self.context.get(app).get("domain")
-        request = {"url": urljoin(domain, url), "data": data}
+        request = {"url": urljoin(domain, url), "data": data, "json": json}
         request.update({"method": "put", "headers": {}, **kwargs})
         return self.request(app=app, account=account, data=Box({"request": request}))
 

{pytest_api_framework_alpha-0.1.8 → pytest_api_framework_alpha-0.2.0}/framework/conftest.py

@@ -116,7 +116,7 @@ def pytest_generate_tests(metafunc):
     if not case_data:
         case_data["_scenario"] = {"data": {}}
         case_data["_belong_app"] = belong_app
-        metafunc.parametrize("data", [case_data, ], ids=['#1'], scope="function")
+        metafunc.parametrize("data", [case_data, ], ids=[f'{case_data.get("title", "")}#'], scope="function")
         return
     if case_data.get("request") is None:
         case_data["request"] = dict()
@@ -135,7 +135,7 @@ def pytest_generate_tests(metafunc):
     if not url:
         # UPDATE: 有的步骤不需要请求接口 比如 只校验数据库， 去掉下面的校验
         if not case_common.get("url"):
-            logger.warning(f"测试数据request中缺少必填字段: url", case_data)
+            logger.warning(f"{func_file_path} request中缺少必填字段: url", case_data)
             # pytest.exit(ExitCode.YAML_MISSING_FIELDS)
     else:
         if url.strip().startswith("${"):
@@ -146,19 +146,19 @@ def pytest_generate_tests(metafunc):
     if not method:
         # UPDATE: 有的步骤不需要请求接口 比如 只校验数据库， 去掉下面的校验
         if not case_common.get("method"):
-            logger.warning(f"测试数据request中缺少必填字段: method", case_data)
+            logger.warning(f"{func_file_path} request中缺少必填字段: method", case_data)
             # pytest.exit(ExitCode.YAML_MISSING_FIELDS)
 
     for key in ["title", "level"]:
         if key not in case_data:
-            logger.error(f"测试数据{func_name}中缺少必填字段: {key}", case_data)
-            pytest.exit(ExitCode.YAML_MISSING_FIELDS)
+            logger.warning(f"{func_file_path} 缺少必填字段: {key}", case_data)
+            # pytest.exit(ExitCode.YAML_MISSING_FIELDS)
 
     if case_data.get("mark"):
         metafunc.function.marks = [case_data.get("mark"), case_data.get("level")]
     else:
         metafunc.function.marks = [case_data.get("level")]
-        
+
     scenarios = case_common.get("scenarios")
     case_data_list = list()
     if scenarios:
@@ -310,7 +310,7 @@ def sort(case_items):
 def pytest_collection_finish(session):
     """获取最终排序后的 items 列表"""
     # 过滤掉item名称是test_setup或test_teardown的
-    session.items = [item for item in session.items if item.name not in ["test_setup", "test_setup"]]
+    session.items = [item for item in session.items if item.name not in ["test_setup", "test_teardown"]]
 
     # 1. 筛选出带井号 名称带'#' 的item，并记录原始索引
     hash_items_with_index = [(index, item) for index, item in enumerate(session.items) if "#" in item.name]
@@ -383,7 +383,7 @@ def pytest_runtest_call(item):
     if ignore_error_and_continue == "false":
         # setup方法执行失败，则主动标记用例执行失败，不会执行用例
         if item.funcargs.get("setup_success") is False:
-            pytest.skip(f"{item.nodeid} test_before_scenario execute error")
+            pytest.skip("test_before_scenario execute error")
         # 判断上一个用例是否执行失败，如果上一个用例执行失败，则主动标记用例执行失败，不会执行用例（解决场景性用例，有一个失败则后续用例判为失败）
         index = item.session.items.index(item)
         current_cls_name = item.parent.name
@@ -396,8 +396,10 @@ def pytest_runtest_call(item):
                         1) == current_turn.group(1):  # 确保是同一个类
                     status = getattr(prev_item, "status", None)  # 访问 status 属性
                     skip_reason = getattr(prev_item, "skip_reason", None)  # 访问 skip_reason 属性
-                    if status == "skipped" and skip_reason in ["the previous method execution skipped",
-                                                               "the previous method execution failed"]:
+                    if status == "skipped" and skip_reason.strip() in [
+                        "the previous method execution skipped",
+                        "the previous method execution failed",
+                        "test_before_scenario execute error"]:
                         pytest.skip("the previous method execution skipped")
                     elif status == "failed":
                         pytest.skip("the previous method execution failed")

{pytest_api_framework_alpha-0.1.8 → pytest_api_framework_alpha-0.2.0}/pytest_api_framework_alpha.egg-info/PKG-INFO

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

{pytest_api_framework_alpha-0.1.8 → pytest_api_framework_alpha-0.2.0}/setup.py

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