cli-test-framework 0.8.1__tar.gz → 0.9.1__tar.gz

{cli_test_framework-0.8.1/src/cli_test_framework.egg-info → cli_test_framework-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-test-framework
-Version: 0.8.1
+Version: 0.9.1
 Summary: A powerful command line testing framework in Python with setup modules, parallel execution, and file comparison capabilities.
 Home-page: https://github.com/ozil111/cli-test-framework
 Author: Xiaotong Wang
@@ -56,7 +56,7 @@ CLI Test Framework was built for that workflow.
 - **Sequence Steps** — Multi-step execution within a single test case, fail-fast
 - **Setup Module** — Auto-configure environment variables before tests, auto-cleanup after
 - **File Comparison** — Text / JSON / CSV / XML / HDF5 / Binary, with CLI and embedded assertion support
-- **Filtered Execution** — Run specific test cases by name
+- **Filtered Execution** — Run specific test cases by name or tag
 - **JUnit XML Output** — `--junit-xml` for GitLab CI / Jenkins / CircleCI test report panels
 
 ## Quick Start
@@ -76,6 +76,7 @@ pip install cli-test-framework
             "name": "hello",
             "command": "echo",
             "args": ["Hello World"],
+            "tags": ["smoke"],
             "expected": {
                 "return_code": 0,
                 "output_contains": ["Hello World"]
@@ -145,6 +146,19 @@ Multiple files and mixed assertion types coexist naturally:
 cli-test run test_cases.json --parallel --workers 4
 ```
 
+### Run Specific Cases
+
+```bash
+# By name
+cli-test run test_cases.json -t test_1 -t test_2
+
+# By tag
+cli-test run test_cases.json --tag smoke
+
+# Combine name and tag (AND logic)
+cli-test run test_cases.json -t test_1 --tag smoke
+```
+
 ### JUnit XML (CI Integration)
 
 ```bash
@@ -184,6 +198,10 @@ compare-files result1.h5 result2.h5 --h5-table-regex "output_.*" --h5-rtol 1e-5
 
 ## Changelog
 
+### 0.9.0
+
+- **Tag filtering**: New `tags` field in test case definitions for categorization. Use `--tag` CLI option or `test_case_tag_filter` Python API to batch-filter test cases. Acts as OR within tags, AND with name filtering.
+
 ### 0.8.0
 
 - **JUnit XML output**: New `--junit-xml <filepath>` CLI option writes JUnit-format XML reports that integrate directly with GitLab CI, Jenkins, CircleCI, and other CI tools. Supports `passed` / `failed` / `timeout` / `error` status mapping. Zero extra dependencies — built with `xml.etree.ElementTree`.

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/README.md

@@ -20,7 +20,7 @@ CLI Test Framework was built for that workflow.
 - **Sequence Steps** — Multi-step execution within a single test case, fail-fast
 - **Setup Module** — Auto-configure environment variables before tests, auto-cleanup after
 - **File Comparison** — Text / JSON / CSV / XML / HDF5 / Binary, with CLI and embedded assertion support
-- **Filtered Execution** — Run specific test cases by name
+- **Filtered Execution** — Run specific test cases by name or tag
 - **JUnit XML Output** — `--junit-xml` for GitLab CI / Jenkins / CircleCI test report panels
 
 ## Quick Start
@@ -40,6 +40,7 @@ pip install cli-test-framework
             "name": "hello",
             "command": "echo",
             "args": ["Hello World"],
+            "tags": ["smoke"],
             "expected": {
                 "return_code": 0,
                 "output_contains": ["Hello World"]
@@ -109,6 +110,19 @@ Multiple files and mixed assertion types coexist naturally:
 cli-test run test_cases.json --parallel --workers 4
 ```
 
+### Run Specific Cases
+
+```bash
+# By name
+cli-test run test_cases.json -t test_1 -t test_2
+
+# By tag
+cli-test run test_cases.json --tag smoke
+
+# Combine name and tag (AND logic)
+cli-test run test_cases.json -t test_1 --tag smoke
+```
+
 ### JUnit XML (CI Integration)
 
 ```bash
@@ -148,6 +162,10 @@ compare-files result1.h5 result2.h5 --h5-table-regex "output_.*" --h5-rtol 1e-5
 
 ## Changelog
 
+### 0.9.0
+
+- **Tag filtering**: New `tags` field in test case definitions for categorization. Use `--tag` CLI option or `test_case_tag_filter` Python API to batch-filter test cases. Acts as OR within tags, AND with name filtering.
+
 ### 0.8.0
 
 - **JUnit XML output**: New `--junit-xml <filepath>` CLI option writes JUnit-format XML reports that integrate directly with GitLab CI, Jenkins, CircleCI, and other CI tools. Supports `passed` / `failed` / `timeout` / `error` status mapping. Zero extra dependencies — built with `xml.etree.ElementTree`.

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/docs/user_manual.md

@@ -5,6 +5,8 @@
 - [安装](#安装)
 - [测试用例定义](#测试用例定义)
 - [运行测试](#运行测试)
+- [占位符（变量替换）](#占位符变量替换)
+- [标签过滤](#标签过滤)
 - [Setup 模块](#setup-模块)
 - [并行测试](#并行测试)
 - [顺序步骤测试](#顺序步骤测试)
@@ -100,6 +102,7 @@ test_cases:
 | `args` | 否 | 命令参数列表 |
 | `description` | 否 | 测试用例描述 |
 | `timeout` | 否 | 超时秒数，默认 3600，设 `null` 无限制 |
+| `tags` | 否 | 标签列表，用于批量过滤（如 `["smoke", "fast"]`） |
 | `resources` | 否 | 资源配置，见[资源感知调度](#资源感知调度) |
 | `expected.return_code` | 否 | 期望返回码 |
 | `expected.output_contains` | 否 | 输出需包含的字符串列表 |
@@ -162,6 +165,13 @@ cli-test run test_cases.json --parallel --execution-mode process
 # 只运行指定用例
 cli-test run test_cases.json -t test_name_1 -t test_name_2
 
+# 按标签过滤
+cli-test run test_cases.json --tag smoke
+cli-test run test_cases.json --tag smoke --tag regression
+
+# 同时按名称和标签过滤（AND 关系）
+cli-test run test_cases.json -t test_name_1 --tag smoke
+
 # 详细输出
 cli-test run test_cases.json --verbose
 
@@ -191,6 +201,7 @@ runner = JSONRunner(
     config_file="test_cases.json",
     workspace="/path/to/project",    # 可选，默认项目根目录
     test_case_filter=["test_1"],     # 可选，只运行指定用例
+    test_case_tag_filter=["smoke"],  # 可选，只运行包含指定标签的用例
     history_dir="./hist",            # 可选，启用历史记录与回归检测
     regression_threshold=2.0,        # 可选，回归阈值倍数，默认 1.5
 )
@@ -235,6 +246,173 @@ for detail in runner.results["details"]:
     print(detail["name"], detail["status"], detail.get("message", ""))
 ```
 
+## 占位符（变量替换）
+
+当同一个配置文件需要在不同环境下使用不同参数（如求解器路径、模型文件路径等）时，可以用 `{变量名}` 占位符编写配置，运行时通过 `--var` 或 `variables` 参数传入实际值。
+
+### 编写含占位符的配置
+
+JSON：
+
+```json
+{
+    "test_cases": [
+        {
+            "name": "求解器测试",
+            "command": "{solver}",
+            "args": ["--input", "{model}", "--output", "{output}"],
+            "expected": { "return_code": 0 }
+        }
+    ]
+}
+```
+
+YAML：
+
+```yaml
+test_cases:
+  - name: 求解器测试
+    command: "{solver}"
+    args: ["--input", "{model}", "--output", "{output}"]
+    expected:
+      return_code: 0
+```
+
+占位符 `{变量名}` 可出现在配置文件的任意字符串值中，包括 `command`、`args`、`name`、`expected.output_contains` 等。支持同一个字符串中使用多个占位符，如 `"{solver} --input {model}"`。
+
+> **安全设计**：只有 `variables` 字典中存在的 key 才会被替换。`{xxx}` 若无匹配不会报错，而是原样保留。因此 `expected.output_matches` 中的正则模式（如 `{2,}`、`\d{4}`）不受影响。
+
+### 用法
+
+#### CLI
+
+```bash
+# 单个变量
+cli-test run test_cases.json --var solver=/opt/solver/bin/solver.exe
+
+# 多个变量
+cli-test run test_cases.json --var solver=/opt/solver/bin/solver.exe --var model=./data/model.dat
+
+# 与并行模式、标签过滤等组合使用
+cli-test run test_cases.json --var solver=solver.exe --parallel --workers 4 --tag smoke
+```
+
+`--var` 格式为 `KEY=VALUE`，可多次使用。等号分隔，key 和 value 两侧的空格会被自动去除。
+
+#### Python API
+
+```python
+from cli_test_framework.runners import JSONRunner, YAMLRunner, ParallelJSONRunner, ParallelYAMLRunner
+
+# 顺序运行
+runner = JSONRunner(
+    config_file="test_cases.json",
+    variables={
+        "solver": "/opt/solver/bin/solver.exe",
+        "model": "./data/model.dat",
+        "output": "./results/output.dat",
+    },
+)
+success = runner.run_tests()
+
+# 并行运行
+runner = ParallelJSONRunner(
+    config_file="test_cases.json",
+    variables={"solver": "/opt/solver/bin/solver.exe"},
+)
+success = runner.run_tests()
+
+# YAML 同样支持
+runner = YAMLRunner(
+    config_file="test_cases.yaml",
+    variables={"solver": "/opt/solver/bin/solver.exe"},
+)
+success = runner.run_tests()
+```
+
+### 适用场景
+
+| 场景 | 示例 |
+|---|---|
+| 不同求解器版本测试 | `--var solver=v1.0/solver.exe` ↔ `--var solver=v2.0/solver.exe` |
+| 不同输入数据 | `--var model=case_1.dat` ↔ `--var model=case_2.dat` |
+| CI/CD 环境适配 | 本地 `/opt/solver.exe`，CI `/runner/solver.exe` |
+| 多平台路径 | Windows `--var solver=C:\solver.exe`，Linux `--var solver=/opt/solver.exe` |
+
+## 标签过滤
+
+通过标签（tags）可以对测试用例进行分类，并在运行时按标签批量过滤。标签过滤与名称过滤可同时使用，满足 AND 关系（两个条件都必须满足）。
+
+### 在测试用例中定义标签
+
+JSON：
+
+```json
+{
+    "test_cases": [
+        {
+            "name": "快速测试",
+            "command": "echo",
+            "args": ["hello"],
+            "tags": ["smoke", "fast"],
+            "expected": { "return_code": 0 }
+        },
+        {
+            "name": "完整回归测试",
+            "command": "python",
+            "args": ["long_test.py"],
+            "tags": ["regression", "slow"],
+            "expected": { "return_code": 0 }
+        }
+    ]
+}
+```
+
+YAML：
+
+```yaml
+test_cases:
+  - name: 快速测试
+    command: echo
+    args: ["hello"]
+    tags: ["smoke", "fast"]
+    expected:
+      return_code: 0
+```
+
+`tags` 是可选字段，不指定则默认为空列表。每个用例可以有多个标签。
+
+### 运行时过滤
+
+```bash
+# 只运行带 "smoke" 标签的用例
+cli-test run test_cases.json --tag smoke
+
+# 运行带 "smoke" 或 "regression" 标签的用例（OR 关系）
+cli-test run test_cases.json --tag smoke --tag regression
+
+# 同时按名称和标签过滤（AND 关系）
+cli-test run test_cases.json -t alpha --tag fast
+```
+
+### Python API
+
+```python
+runner = JSONRunner(
+    config_file="test_cases.json",
+    test_case_tag_filter=["smoke"],     # 只运行含 smoke 标签的用例
+)
+success = runner.run_tests()
+
+# 结合名称过滤
+runner = JSONRunner(
+    config_file="test_cases.json",
+    test_case_filter=["alpha", "beta"],
+    test_case_tag_filter=["fast"],
+)
+success = runner.run_tests()
+```
+
 ## Setup 模块
 
 Setup 模块在测试前执行初始化、测试后执行清理。

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/setup.py

@@ -8,7 +8,7 @@ with open(os.path.join(this_directory, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name="cli-test-framework",
-    version="0.8.1",
+    version="0.9.1",
     author="Xiaotong Wang",
     author_email="xiaotongwang98@gmail.com",
     description="A powerful command line testing framework in Python with setup modules, parallel execution, and file comparison capabilities.",

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/src/cli_test_framework/cli.py

@@ -22,6 +22,18 @@ from .utils.junit_xml_writer import write_junit_xml
 logger = logging.getLogger("cli_test_framework.cli")
 
 
+def _parse_vars(var_list):
+    """Parse ``['solver=/path', 'model=./m.dat']`` → ``{'solver': '/path', ...}``."""
+    variables = {}
+    for item in var_list or []:
+        if '=' not in item:
+            logger.warning("Ignoring invalid --var '%s' (expected KEY=VALUE)", item)
+            continue
+        key, _, value = item.partition('=')
+        variables[key.strip()] = value.strip()
+    return variables
+
+
 def create_parser():
     """Create and configure the argument parser"""
     parser = argparse.ArgumentParser(
@@ -51,6 +63,8 @@ Examples:
                            help='Output format for test results')
     run_parser.add_argument('--test-case', '-t', action='append', default=None,
                            help='Run only specified test case(s) by name (can be used multiple times)')
+    run_parser.add_argument('--tag', action='append', default=None,
+                           help='Run only test cases with matching tag(s) (can be used multiple times)')
     run_parser.add_argument('--history-dir',
                            help='Directory for .symtest runtime history (enables smart scheduling & regression detection)')
     run_parser.add_argument('--regression-threshold', type=float, default=1.5,
@@ -59,6 +73,11 @@ Examples:
     run_parser.add_argument('--debug', action='store_true', help='Enable debug mode')
     run_parser.add_argument('--junit-xml', dest='junit_xml',
                            help='Write JUnit XML report to the specified file path')
+    run_parser.add_argument('--var', action='append', default=[],
+                           metavar='KEY=VALUE',
+                           help='Set a variable for config placeholder substitution, '
+                                'e.g. --var solver=/path/to/solver '
+                                '(can be used multiple times)')
 
     # ---- Compare command ----
     compare_parser = subparsers.add_parser('compare', help='Compare two files')
@@ -134,6 +153,8 @@ def run_tests(args):
     # construct Namespace objects without the newer arguments.
     history_dir = getattr(args, 'history_dir', None)
     regression_threshold = getattr(args, 'regression_threshold', 1.5)
+    var_list = getattr(args, 'var', [])
+    variables = _parse_vars(var_list)
 
     try:
         if args.parallel:
@@ -145,8 +166,10 @@ def run_tests(args):
                     max_workers=args.workers,
                     execution_mode=args.execution_mode,
                     test_case_filter=args.test_case,
+                    test_case_tag_filter=args.tag,
                     history_dir=history_dir,
                     regression_threshold=regression_threshold,
+                    variables=variables,
                 )
             elif file_ext in ['.yaml', '.yml']:
                 runner = ParallelYAMLRunner(
@@ -155,8 +178,10 @@ def run_tests(args):
                     max_workers=args.workers,
                     execution_mode=args.execution_mode,
                     test_case_filter=args.test_case,
+                    test_case_tag_filter=args.tag,
                     history_dir=history_dir,
                     regression_threshold=regression_threshold,
+                    variables=variables,
                 )
             else:
                 logger.error("Unsupported configuration file format for parallel mode: %s", file_ext)
@@ -168,16 +193,20 @@ def run_tests(args):
                     config_file=str(config_file),
                     workspace=args.workspace,
                     test_case_filter=args.test_case,
+                    test_case_tag_filter=args.tag,
                     history_dir=history_dir,
                     regression_threshold=regression_threshold,
+                    variables=variables,
                 )
             elif file_ext in ['.yaml', '.yml']:
                 runner = YAMLRunner(
                     config_file=str(config_file),
                     workspace=args.workspace,
                     test_case_filter=args.test_case,
+                    test_case_tag_filter=args.tag,
                     history_dir=history_dir,
                     regression_threshold=regression_threshold,
+                    variables=variables,
                 )
             else:
                 logger.error("Unsupported configuration file format: %s", file_ext)

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/src/cli_test_framework/core/base_runner.py

@@ -14,6 +14,7 @@ logger = logging.getLogger("cli_test_framework.core.base_runner")
 class BaseRunner(ABC):
     def __init__(self, config_file: str, workspace: Optional[str] = None,
                  test_case_filter: Optional[List[str]] = None,
+                 test_case_tag_filter: Optional[List[str]] = None,
                  history_dir: Optional[str] = None,
                  regression_threshold: float = 1.5):
         if workspace:
@@ -27,6 +28,7 @@ class BaseRunner(ABC):
             self.config_path = self.workspace / config_path
         self.test_cases: List[TestCase] = []
         self.test_case_filter: Optional[List[str]] = test_case_filter
+        self.test_case_tag_filter: Optional[List[str]] = test_case_tag_filter
         if history_dir:
             self.history_dir = str((self.workspace / history_dir).resolve())
         else:
@@ -63,16 +65,22 @@ class BaseRunner(ABC):
         #         pass
 
     def _apply_test_case_filter(self) -> None:
-        """根据 test_case_filter 过滤测试用例"""
-        if self.test_case_filter:
+        """根据 test_case_filter 和 test_case_tag_filter 过滤测试用例"""
+        if self.test_case_filter or self.test_case_tag_filter:
             original_count = len(self.test_cases)
-            self.test_cases = [tc for tc in self.test_cases if tc.name in self.test_case_filter]
+            self.test_cases = [
+                tc for tc in self.test_cases
+                if (not self.test_case_filter or tc.name in self.test_case_filter)
+                and (not self.test_case_tag_filter
+                     or set(tc.tags or []) & set(self.test_case_tag_filter))
+            ]
             filtered_out = original_count - len(self.test_cases)
             if filtered_out > 0:
                 logger.info("Filtered out %d test case(s). Running %d specified case(s).",
                             filtered_out, len(self.test_cases))
             if not self.test_cases:
-                logger.warning("No matching test cases found for: %s", self.test_case_filter)
+                logger.warning("No matching test cases found for: names=%s, tags=%s",
+                               self.test_case_filter, self.test_case_tag_filter)
 
     def run_tests(self) -> bool:
         """Run all test cases and return whether all tests passed"""

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/src/cli_test_framework/core/config_loader.py

@@ -11,6 +11,7 @@ Backward-compatible: the runner classes still expose ``load_test_cases()`` and
 from __future__ import annotations
 
 import logging
+import re
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
@@ -20,6 +21,40 @@ from ..utils.path_resolver import resolve_paths
 
 logger = logging.getLogger("cli_test_framework.core.config_loader")
 
+# ---------------------------------------------------------------------------
+# Placeholder substitution
+# ---------------------------------------------------------------------------
+
+_PLACEHOLDER_RE = re.compile(r'\{(\w+)\}')
+
+
+def substitute_placeholders(
+    config: Dict[str, Any],
+    variables: Optional[Dict[str, Any]] = None,
+) -> Dict[str, Any]:
+    """递归替换 config 中字符串值的 ``{placeholder}`` 占位符。
+
+    只替换 ``variables`` 中存在的 key，未匹配的 ``{xxx}`` 原样保留，
+    不会影响 ``expected.matches`` 等字段中的正则模式（如 ``{2}``）。
+    """
+    if not variables:
+        return config
+
+    def _sub(value: Any) -> Any:
+        if isinstance(value, str):
+            return _PLACEHOLDER_RE.sub(
+                lambda m: str(variables[m.group(1)])
+                if m.group(1) in variables else m.group(0),
+                value,
+            )
+        if isinstance(value, list):
+            return [_sub(item) for item in value]
+        if isinstance(value, dict):
+            return {k: _sub(v) for k, v in value.items()}
+        return value
+
+    return _sub(config)
+
 
 # ---------------------------------------------------------------------------
 # Test-case parsing (loaded dict → list[TestCase])
@@ -79,6 +114,7 @@ def parse_test_cases(
                 steps=steps,
                 description=case.get("description", ""),
                 resources=case.get("resources"),
+                tags=case.get("tags", []),
             ))
         else:
             # ── Single-command mode (backward-compatible) ──
@@ -100,6 +136,7 @@ def parse_test_cases(
                 description=case.get("description", ""),
                 timeout=case.get("timeout"),
                 resources=case.get("resources"),
+                tags=case.get("tags", []),
             ))
 
     return cases

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/src/cli_test_framework/core/parallel_runner.py

@@ -81,9 +81,7 @@ class ParallelRunner(BaseRunner):
     def __init__(self, config_file: str, workspace: Optional[str] = None, 
                  max_workers: Optional[int] = None, 
                  execution_mode: str = "thread",
-                 test_case_filter: Optional[List[str]] = None,
-                 history_dir: Optional[str] = None,
-                 regression_threshold: float = 1.5):
+                 **kwargs):
         """
         初始化并行运行器
         
@@ -92,11 +90,10 @@ class ParallelRunner(BaseRunner):
             workspace: 工作目录
             max_workers: 最大并发数，默认为CPU核心数
             execution_mode: 执行模式，'thread'(线程) 或 'process'(进程)
-            test_case_filter: 只运行指定名称的测试用例
-            history_dir: .symtest 历史记录目录
-            regression_threshold: 回归检测阈值
+            **kwargs: 透传给 BaseRunner 的额外参数
+                (test_case_filter, test_case_tag_filter, history_dir, regression_threshold)
         """
-        super().__init__(config_file, workspace, test_case_filter, history_dir, regression_threshold)
+        super().__init__(config_file, workspace, **kwargs)
         self.max_workers = max_workers
         self.execution_mode = execution_mode
         self.lock = threading.Lock()  # 用于线程安全的结果更新

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/src/cli_test_framework/core/test_case.py

@@ -21,6 +21,7 @@ class TestCase:
     timeout: Optional[float] = None
     resources: Optional[Dict[str, Any]] = None
     steps: Optional[List[TestCaseStep]] = None
+    tags: List[str] = field(default_factory=list)
     
     def to_dict(self) -> Dict[str, Any]:
         """Convert test case to dictionary format"""
@@ -31,6 +32,7 @@ class TestCase:
             "expected": self.expected,
             "timeout": self.timeout,
             "resources": self.resources,
+            "tags": self.tags,
         }
         if self.steps is not None:
             result["steps"] = [

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/src/cli_test_framework/runners/config_runner.py

@@ -10,7 +10,7 @@ import logging
 from typing import Optional, Dict, Any, Callable, BinaryIO
 
 from ..core.base_runner import BaseRunner
-from ..core.config_loader import parse_test_cases
+from ..core.config_loader import parse_test_cases, substitute_placeholders
 from ..core.test_case import TestCase
 from ..core.execution import execute_single_test_case
 from ..core.types import TestCaseData
@@ -29,13 +29,12 @@ class ConfigRunner(BaseRunner):
 
     def __init__(self, config_file: str = "test_cases.json",
                  workspace: Optional[str] = None,
-                 test_case_filter: Optional[list] = None,
-                 history_dir: Optional[str] = None,
-                 regression_threshold: float = 1.5,
-                 config_loader: Optional[Callable[[BinaryIO], Dict[str, Any]]] = None):
-        super().__init__(config_file, workspace, test_case_filter,
-                         history_dir, regression_threshold)
+                 config_loader: Optional[Callable[[BinaryIO], Dict[str, Any]]] = None,
+                 variables: Optional[Dict[str, Any]] = None,
+                 **kwargs):
+        super().__init__(config_file, workspace, **kwargs)
         self._config_loader = config_loader
+        self._variables = variables or {}
         # Backward-compatible attribute for tests that patch path_resolver
         self.path_resolver = PathResolver(self.workspace)
 
@@ -49,6 +48,8 @@ class ConfigRunner(BaseRunner):
             with open(self.config_path, 'r', encoding='utf-8') as f:
                 config = self._config_loader(f)
 
+            config = substitute_placeholders(config, self._variables)
+
             self.load_setup_from_config(config)
             self.test_cases = parse_test_cases(
                 config, self.workspace, self.path_resolver,

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/src/cli_test_framework/runners/json_runner.py

@@ -12,15 +12,10 @@ class JSONRunner(ConfigRunner):
     """Sequential JSON test runner (backward-compatible thin wrapper)."""
 
     def __init__(self, config_file="test_cases.json",
-                 workspace: Optional[str] = None,
-                 test_case_filter: Optional[list] = None,
-                 history_dir: Optional[str] = None,
-                 regression_threshold: float = 1.5):
+                 workspace: Optional[str] = None, **kwargs):
         super().__init__(
             config_file=config_file,
             workspace=workspace,
-            test_case_filter=test_case_filter,
-            history_dir=history_dir,
-            regression_threshold=regression_threshold,
             config_loader=json.load,
+            **kwargs,
         )

{cli_test_framework-0.8.1 → cli_test_framework-0.9.1}/src/cli_test_framework/runners/parallel_config_runner.py

@@ -10,7 +10,7 @@ import logging
 from typing import Optional, Dict, Any, Callable, BinaryIO
 
 from ..core.parallel_runner import ParallelRunner, AtomicSemaphore
-from ..core.config_loader import parse_test_cases, execute_sequence
+from ..core.config_loader import parse_test_cases, execute_sequence, substitute_placeholders
 from ..core.test_case import TestCase
 from ..core.execution import execute_single_test_case
 from ..core.types import TestCaseData
@@ -31,10 +31,9 @@ class ParallelConfigRunner(ParallelRunner):
                  workspace: Optional[str] = None,
                  max_workers: Optional[int] = None,
                  execution_mode: str = "thread",
-                 test_case_filter: Optional[list] = None,
-                 history_dir: Optional[str] = None,
-                 regression_threshold: float = 1.5,
-                 config_loader: Optional[Callable[[BinaryIO], Dict[str, Any]]] = None):
+                 config_loader: Optional[Callable[[BinaryIO], Dict[str, Any]]] = None,
+                 variables: Optional[Dict[str, Any]] = None,
+                 **kwargs):
         # Auto-detect physical CPU cores (reserve 2 for OS)
         self.total_physical = os.cpu_count() or 4
         self.safe_capacity = max(1, self.total_physical - 2)
@@ -43,9 +42,9 @@ class ParallelConfigRunner(ParallelRunner):
             max_workers = self.total_physical
 
         super().__init__(config_file, workspace, max_workers,
-                         execution_mode, test_case_filter,
-                         history_dir, regression_threshold)
+                         execution_mode, **kwargs)
         self._config_loader = config_loader
+        self._variables = variables or {}
         # Backward-compatible attribute for tests that patch path_resolver
         self.path_resolver = PathResolver(self.workspace)
 
@@ -124,6 +123,8 @@ class ParallelConfigRunner(ParallelRunner):
             with open(self.config_path, 'r', encoding='utf-8') as f:
                 config = self._config_loader(f)
 
+            config = substitute_placeholders(config, self._variables)
+
             self.load_setup_from_config(config)
             self.test_cases = parse_test_cases(
                 config, self.workspace, self.path_resolver,