pytest-platform-adapter 1.1.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

pytest_platform_adapter/plugin.py

@@ -37,6 +37,7 @@ ENV_RUNTIME_KEY: StashKey["EnvCheckRuntime"] = StashKey()
 ITEM_KIND_KEY: StashKey[str] = StashKey()
 BEHAVIOR_KEY: StashKey[Optional[str]] = StashKey()
 ENV_XFAIL_REASON_KEY: StashKey[Optional[str]] = StashKey()
+FORCED_ITEMS_KEY: StashKey[List[pytest.Item]] = StashKey()
 STASH_SENTINEL = object()
 
 
@@ -45,6 +46,7 @@ class EnvCheckSettings:
     mode: str = 'all'
     behavior_scope: str = 'feature'
     fail_action: str = 'skip'
+    collect_mode: str = 'force'  # force(强制)/auto(自动)
     global_nodeids: List[str] = field(default_factory=list)
     behavior_nodeids: List[str] = field(default_factory=list)
 
@@ -104,6 +106,13 @@ def pytest_addoption(parser):
         default=None,
         help='特性级检查所使用的 Allure 标签层级：epic/feature/story'
     )
+    group.addoption(
+        '--env-check-collect-mode',
+        action='store',
+        default=None,
+        choices=['force', 'auto'],
+        help='环境检查收集模式覆盖：force(强制收集并执行)/auto(仅执行已收集到的检查用例)'
+    )
     parser.addini(
         'platform_ip',
         help='自动化平台API IP',
@@ -146,8 +155,13 @@ def pytest_addoption(parser):
         help='环境检查失败后对业务用例的处理方式（skip/xfail/none）',
         default='skip'
     )
+    parser.addini(
+        'platform_env_collect_mode',
+        help='环境检查收集模式：force(强制收集并执行)/auto(仅执行已收集到的检查用例)',
+        default='force'
+    )
 
-
+@pytest.hookimpl(tryfirst=True, hookwrapper=True)
 def pytest_collection_modifyitems(config, items):
     """
     hook收集用例的过程，给--case_ids和--case_ids_file提供支持
@@ -155,8 +169,27 @@ def pytest_collection_modifyitems(config, items):
     """
     settings = get_env_settings(config)
     forced_nodeids = _collect_forced_nodeids(settings)
-    initial_nodeids = {item.nodeid for item in items}
-    for missing in sorted(forced_nodeids - initial_nodeids):
+    # 预先快照强制环境检查用例，供后续无视 -m / -k 过滤使用。
+    if env_checks_enabled(settings) and settings.collect_mode == 'force':
+        forced_items: List[pytest.Item] = []
+        seen: Set[str] = set()
+        for item in items:
+            if _is_forced_item(item.nodeid, forced_nodeids) and item.nodeid not in seen:
+                forced_items.append(item)
+                seen.add(item.nodeid)
+        config.stash[FORCED_ITEMS_KEY] = forced_items
+    yield
+    # 缺失检查告警：force 模式下使用 pre-deselect 的快照判断，避免被 -m/-k 误判。
+    if env_checks_enabled(settings) and settings.collect_mode == 'force':
+        forced_items_snapshot = config.stash.get(FORCED_ITEMS_KEY, [])
+        available_ids = {item.nodeid for item in forced_items_snapshot}
+    else:
+        available_ids = {item.nodeid for item in items}
+    missing_forced: List[str] = []
+    for prefix in forced_nodeids:
+        if not any(n == prefix or n.startswith(prefix + "::") for n in available_ids):
+            missing_forced.append(prefix)
+    for missing in sorted(missing_forced):
         logger.warning(f"配置的环境检查用例 {missing} 未被收集，检查 NodeID 是否正确")
 
     target_ids = get_target_test_ids(config)
@@ -164,7 +197,7 @@ def pytest_collection_modifyitems(config, items):
     deselected = []
     for item in items:
         nodeid = item.nodeid
-        should_force_run = nodeid in forced_nodeids
+        should_force_run = _is_forced_item(nodeid, forced_nodeids)
         title = allure_title(item)
         test_id = get_test_id_from_title(title)
         if not target_ids or should_force_run or test_id in target_ids:
@@ -182,6 +215,16 @@ def pytest_collection_modifyitems(config, items):
     if deselected:
         config.hook.pytest_deselected(items=deselected)
     items[:] = selected
+
+    # force 模式下无视 -m / -k 的 deselect：把缓存的环境检查重新插回来
+    if env_checks_enabled(settings) and settings.collect_mode == 'force':
+        forced_items = config.stash.get(FORCED_ITEMS_KEY, [])
+        current_ids = {item.nodeid for item in items}
+        for forced_item in forced_items:
+            if forced_item.nodeid not in current_ids:
+                items.append(forced_item)
+                current_ids.add(forced_item.nodeid)
+
     selected_ids = [get_test_id_from_title(allure_title(item)) for item in items]
     test_stats['total'] = len(items)  # 更新总用例数
     if target_ids:
@@ -337,8 +380,37 @@ def pytest_configure(config):
         '--scan'), config.getini('platform_ip'), config.getini('platform_port'), config.getini(
         'platform_path'), config.getini('platform_use_https')
     settings = build_env_check_settings(config)
+    if config.getoption('--scan'):
+        # 扫描模式下禁用环境检查，避免强制收集影响正常用例收集。
+        settings.mode = 'off'
     config.stash[ENV_SETTINGS_KEY] = settings
     config.stash[ENV_RUNTIME_KEY] = EnvCheckRuntime()
+    # 在强制模式下，将声明的环境检查 NodeID 注入到 pytest 收集参数中，
+    # 以保证即使用户只选择了业务目录也能收集到检查用例。
+    if env_checks_enabled(settings) and settings.collect_mode == 'force':
+        try:
+            from pathlib import Path
+
+            existing_args = set(config.args or [])
+            rootpath = getattr(config, "rootpath", Path.cwd())
+            forced_args: List[str] = []
+            for nodeid in _collect_forced_nodeids(settings):
+                if nodeid in existing_args:
+                    continue
+                # 仅对文件路径存在的 NodeID 进行注入，避免明显的 not found。
+                path_part = nodeid.split("::", 1)[0]
+                p = Path(path_part)
+                if not p.is_absolute():
+                    p = rootpath / p
+                if p.exists():
+                    forced_args.append(nodeid)
+                else:
+                    logger.warning("强制收集环境检查失败：文件不存在 %s", nodeid)
+            if forced_args:
+                config.args.extend(forced_args)
+                logger.debug("已强制注入环境检查收集参数: %s", forced_args)
+        except Exception as e:
+            logger.warning("强制收集环境检查参数注入异常：%s", e)
     pipeline_name = os.environ.get("JOB_NAME")
     build_number = os.environ.get("BUILD_NUMBER")
     handler = logging.StreamHandler()
@@ -412,6 +484,16 @@ def build_env_check_settings(config) -> EnvCheckSettings:
     if fail_action not in {'skip', 'xfail', 'none'}:
         logger.warning("platform_env_fail_action=%s 不受支持，改用 skip", fail_action_raw)
         fail_action = 'skip'
+    collect_mode_opt = config.getoption('--env-check-collect-mode')
+    collect_mode_raw = collect_mode_opt or config.getini('platform_env_collect_mode')
+    collect_mode = (collect_mode_raw or 'force').strip().lower()
+    if collect_mode in {'强制'}:
+        collect_mode = 'force'
+    elif collect_mode in {'自动'}:
+        collect_mode = 'auto'
+    if collect_mode not in {'force', 'auto'}:
+        logger.warning("platform_env_collect_mode=%s 不受支持，改用 force", collect_mode_raw)
+        collect_mode = 'force'
     global_nodes = _normalize_nodeids(config.getini('platform_env_global_checks'))
     behavior_nodes = _normalize_nodeids(config.getini('platform_env_behavior_checks'))
     if mode not in {'off', 'global', 'behavior', 'all'}:
@@ -421,6 +503,7 @@ def build_env_check_settings(config) -> EnvCheckSettings:
         mode=mode,
         behavior_scope=scope,
         fail_action=fail_action,
+        collect_mode=collect_mode,
         global_nodeids=global_nodes,
         behavior_nodeids=behavior_nodes,
     )
@@ -462,40 +545,54 @@ def _collect_forced_nodeids(settings: Optional[EnvCheckSettings]) -> Set[str]:
     return forced
 
 
+def _is_forced_item(nodeid: str, forced_nodeids: Set[str]) -> bool:
+    """支持用父级 NodeID（如模块/类）声明的强制收集。"""
+    if nodeid in forced_nodeids:
+        return True
+    for forced in forced_nodeids:
+        if nodeid.startswith(forced + "::"):
+            return True
+    return False
+
+
 def _apply_env_check_collection_logic(config, settings: EnvCheckSettings, items: List[pytest.Item]) -> None:
-    node_map = {item.nodeid: item for item in items}
     ordered: List[pytest.Item] = []
     consumed: Set[str] = set()
     missing_behaviors: List[str] = []
 
-    for nodeid in settings.global_nodeids:
-        item = node_map.get(nodeid)
-        if not item:
-            continue
-        ordered.append(item)
-        consumed.add(nodeid)
-        item.stash[ITEM_KIND_KEY] = 'global_check'
-        item.stash[BEHAVIOR_KEY] = None
+    # 1) 全局检查：支持使用模块/类 NodeID 作为前缀声明。
+    for prefix in settings.global_nodeids:
+        for item in items:
+            if item.nodeid in consumed:
+                continue
+            if item.nodeid == prefix or item.nodeid.startswith(prefix + "::"):
+                ordered.append(item)
+                consumed.add(item.nodeid)
+                item.stash[ITEM_KIND_KEY] = 'global_check'
+                item.stash[BEHAVIOR_KEY] = None
 
+    # 2) 特性级检查：同样支持前缀声明，按行为（epic/feature/story）绑定。
     behavior_checks: Dict[str, pytest.Item] = {}
-    for nodeid in settings.behavior_nodeids:
-        item = node_map.get(nodeid)
-        if not item:
-            continue
-        behavior = _ensure_behavior_stashed(item, settings.behavior_scope)
-        if not behavior:
-            missing_behaviors.append(nodeid)
-            continue
-        if behavior in behavior_checks:
-            logger.warning(
-                "特性级检查 %s 重复定义，沿用首次声明的用例 %s",
-                behavior,
-                behavior_checks[behavior].nodeid,
-            )
-            continue
-        behavior_checks[behavior] = item
-        consumed.add(nodeid)
-        item.stash[ITEM_KIND_KEY] = 'behavior_check'
+    for prefix in settings.behavior_nodeids:
+        for item in items:
+            if item.nodeid in consumed:
+                continue
+            if item.nodeid != prefix and not item.nodeid.startswith(prefix + "::"):
+                continue
+            behavior = _ensure_behavior_stashed(item, settings.behavior_scope)
+            if not behavior:
+                missing_behaviors.append(item.nodeid)
+                continue
+            if behavior in behavior_checks:
+                logger.warning(
+                    "特性级检查 %s 重复定义，沿用首次声明的用例 %s",
+                    behavior,
+                    behavior_checks[behavior].nodeid,
+                )
+                continue
+            behavior_checks[behavior] = item
+            consumed.add(item.nodeid)
+            item.stash[ITEM_KIND_KEY] = 'behavior_check'
 
     if missing_behaviors:
         logger.warning(
@@ -504,6 +601,7 @@ def _apply_env_check_collection_logic(config, settings: EnvCheckSettings, items:
             missing_behaviors,
         )
 
+    # 3) 按业务用例的行为插入对应检查。
     behavior_inserted: Set[str] = set()
     for item in items:
         if item.nodeid in consumed:
@@ -516,10 +614,12 @@ def _apply_env_check_collection_logic(config, settings: EnvCheckSettings, items:
             behavior_inserted.add(behavior)
         ordered.append(item)
 
-    for behavior, check_item in behavior_checks.items():
-        if behavior not in behavior_inserted:
-            ordered.append(check_item)
-            behavior_inserted.add(behavior)
+    # 4) 未匹配到业务用例的特性级检查：force 模式下不执行；auto 模式保持原行为（放到末尾执行）。
+    if settings.collect_mode != 'force':
+        for behavior, check_item in behavior_checks.items():
+            if behavior not in behavior_inserted:
+                ordered.append(check_item)
+                behavior_inserted.add(behavior)
 
     if ordered:
         items[:] = ordered

{pytest_platform_adapter-1.1.0.dist-info → pytest_platform_adapter-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest_platform_adapter
-Version: 1.1.0
+Version: 1.2.1
 Summary: Pytest集成自动化平台插件
 Author-email: BlackYau <blackyau426@gmail.com>
 Maintainer-email: BlackYau <blackyau426@gmail.com>
@@ -22,6 +22,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Software Development :: Testing :: Acceptance
@@ -87,7 +88,8 @@ pip install -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple pytest-platf
 然后在命令行中使用以下命令安装（你需要提前安装 `pytest` 和 `allure-pytest`）
 
 ```
-pip install pytest_platform_adapter-1.1.0-py3-none-any.whl
+# 需要把下面的 x.x.x 替换为实际的版本号
+pip install pytest_platform_adapter-x.x.x-py3-none-any.whl
 ```
 
 #### 国内镜像站下载离线安装
@@ -99,7 +101,8 @@ pip install pytest_platform_adapter-1.1.0-py3-none-any.whl
 然后在命令行中使用以下命令安装（你需要提前安装 `pytest` 和 `allure-pytest`）
 
 ```
-pip install pytest_platform_adapter-1.1.0-py3-none-any.whl
+# 需要把下面的 x.x.x 替换为实际的版本号
+pip install pytest_platform_adapter-x.x.x-py3-none-any.whl
 ```
 
 ## 使用方法
@@ -193,17 +196,22 @@ platform_env_behavior_checks =
     tests/env_check/test_function_env_check.py::TestFunctionEnvCheck
 platform_env_behavior_scope = epic     # epic / feature / story
 platform_env_fail_action = skip        # skip / xfail / none
+platform_env_collect_mode = force      # force / auto
 ```
 
 - `platform_env_global_checks`：在每次用例执行前跑一遍的检查用例列表。
 - `platform_env_behavior_checks`：特性级检查用例列表，插件会读取这些用例标签并在同一特性的首个用例前插入执行。
 - `platform_env_behavior_scope`：定义特性的级别可选的有 epic/feature/story（分别对应 Allure Report 的 behaviors 中的一级目录、二级目录、三级目录）
 - `platform_env_fail_action`：检查失败后对后续业务用例的处理方式，`skip` 为直接跳过、`xfail` 为继续执行并动态加上 `xfail`（失败记为 XFAIL、通过记为 XPASS）、`none` 仅记录日志不干预执行。
+- `platform_env_collect_mode`：环境检查收集模式，默认 `force`。
+  - `force`（强制）：即使本次命令行只收集了业务目录，也会强制把 `platform_env_global_checks` / `platform_env_behavior_checks` 声明的 NodeID 注入收集范围；环境检查用例不受 `-m`/`-k` 等筛选影响永远执行；全局检查永远执行；特性级检查仅在本次业务用例中存在同一行为标签（scope 对应 epic/feature/story）的情况下才执行，没有匹配的特性级检查不会执行。
+  - `auto`（自动）：不额外注入收集参数，仅执行本次 pytest 收集到的检查用例；如果声明的 NodeID 没有被收集到则不会执行。
 
 #### 命令行
 
 - `--env-check-mode={off,global,behavior,all}`：快速控制启用的检查范围。
 - `--env-check-scope=<epic|feature|story>`：临时覆盖行为层级设定。
+- `--env-check-collect-mode={force,auto}`：临时覆盖 `platform_env_collect_mode`，控制环境检查的收集/执行策略。
 - 当 `platform_env_fail_action=xfail` 时，会在受影响的业务用例上自动添加 `pytest.mark.xfail(run=True, strict=False)`，用例依旧执行，只是失败时记为 XFAIL。
 
 当检查用例失败时，插件会在 `pytest_runtest_setup` 阶段统一对后续业务用例执行 `skip` 或 `xfail`，并在日志中说明对应的检查节点。检查用例自身依旧遵循 pytest 原生语义，可继续使用 `skip/xfail/flaky` 等标记。

pytest_platform_adapter-1.2.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+pytest_platform_adapter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pytest_platform_adapter/plugin.py,sha256=GBZSJZEa6KZD2zTjN4qbtgkxLUX0js7q9QRjldRf1Qk,26791
+pytest_platform_adapter-1.2.1.dist-info/licenses/LICENSE,sha256=QOkNlcvUHENY86LE8OEpmtwMM24v76pgF4FmkEk8aXI,1064
+pytest_platform_adapter-1.2.1.dist-info/METADATA,sha256=Wh81pUMUEjEkecFrtyBlk6SwOAOpX5_xfDixeNeq-4A,11480
+pytest_platform_adapter-1.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pytest_platform_adapter-1.2.1.dist-info/entry_points.txt,sha256=VorMHllVSkGNUUsVJOCrDMeW0-oLco5XcrmdfxND48c,61
+pytest_platform_adapter-1.2.1.dist-info/top_level.txt,sha256=OnTaKf7GCc7yqBHQ4H2XLK8PAz7oHslUZKEsd1t5BpA,24
+pytest_platform_adapter-1.2.1.dist-info/RECORD,,

{pytest_platform_adapter-1.1.0.dist-info → pytest_platform_adapter-1.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pytest_platform_adapter-1.1.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-pytest_platform_adapter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytest_platform_adapter/plugin.py,sha256=KAnSugCo9L8uceSO22LRi28myAclU3WSOo0Tpfiupp4,21604
-pytest_platform_adapter-1.1.0.dist-info/licenses/LICENSE,sha256=QOkNlcvUHENY86LE8OEpmtwMM24v76pgF4FmkEk8aXI,1064
-pytest_platform_adapter-1.1.0.dist-info/METADATA,sha256=wSKR3CVr40S3fNRTUDcCTNDXMWG_-yi2GP9vdiHBXLE,10437
-pytest_platform_adapter-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytest_platform_adapter-1.1.0.dist-info/entry_points.txt,sha256=VorMHllVSkGNUUsVJOCrDMeW0-oLco5XcrmdfxND48c,61
-pytest_platform_adapter-1.1.0.dist-info/top_level.txt,sha256=OnTaKf7GCc7yqBHQ4H2XLK8PAz7oHslUZKEsd1t5BpA,24
-pytest_platform_adapter-1.1.0.dist-info/RECORD,,