pytest-dsl 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

pytest_dsl/cli.py

@@ -7,12 +7,14 @@ pytest-dsl命令行入口
 import sys
 import argparse
 import pytest
+import os
 from pathlib import Path
 
 from pytest_dsl.core.lexer import get_lexer
 from pytest_dsl.core.parser import get_parser
 from pytest_dsl.core.dsl_executor import DSLExecutor
 from pytest_dsl.core.yaml_vars import yaml_vars
+from pytest_dsl.core.auto_directory import SETUP_FILE_NAME, TEARDOWN_FILE_NAME, execute_hook_file
 
 
 def read_file(filename):
@@ -24,7 +26,7 @@ def read_file(filename):
 def parse_args():
     """解析命令行参数"""
     parser = argparse.ArgumentParser(description='执行DSL测试文件')
-    parser.add_argument('dsl_file', help='要执行的DSL文件路径')
+    parser.add_argument('path', help='要执行的DSL文件路径或包含DSL文件的目录')
     parser.add_argument('--yaml-vars', action='append', default=[], 
                        help='YAML变量文件路径，可以指定多个文件 (例如: --yaml-vars vars1.yaml --yaml-vars vars2.yaml)')
     parser.add_argument('--yaml-vars-dir', default=None,
@@ -56,9 +58,33 @@ def load_yaml_variables(args):
             sys.exit(1)
 
 
+def execute_dsl_file(file_path, lexer, parser, executor):
+    """执行单个DSL文件"""
+    try:
+        print(f"执行文件: {file_path}")
+        dsl_code = read_file(file_path)
+        ast = parser.parse(dsl_code, lexer=lexer)
+        executor.execute(ast)
+        return True
+    except Exception as e:
+        print(f"执行失败 {file_path}: {e}")
+        return False
+
+
+def find_dsl_files(directory):
+    """查找目录中的所有DSL文件"""
+    dsl_files = []
+    for root, _, files in os.walk(directory):
+        for file in files:
+            if file.endswith(('.dsl', '.auto')) and file not in [SETUP_FILE_NAME, TEARDOWN_FILE_NAME]:
+                dsl_files.append(os.path.join(root, file))
+    return dsl_files
+
+
 def main():
     """命令行入口点"""
     args = parse_args()
+    path = args.path
     
     # 加载YAML变量
     load_yaml_variables(args)
@@ -67,14 +93,51 @@ def main():
     parser = get_parser()
     executor = DSLExecutor()
     
-    try:
-        dsl_code = read_file(args.dsl_file)
-        ast = parser.parse(dsl_code, lexer=lexer)
-        executor.execute(ast)
-    except Exception as e:
-        print(f"执行失败: {e}")
+    # 检查路径是文件还是目录
+    if os.path.isfile(path):
+        # 执行单个文件
+        success = execute_dsl_file(path, lexer, parser, executor)
+        if not success:
+            sys.exit(1)
+    elif os.path.isdir(path):
+        # 执行目录中的所有DSL文件
+        print(f"执行目录: {path}")
+        
+        # 先执行目录的setup文件（如果存在）
+        setup_file = os.path.join(path, SETUP_FILE_NAME)
+        if os.path.exists(setup_file):
+            execute_hook_file(Path(setup_file), True, path)
+        
+        # 查找并执行所有DSL文件
+        dsl_files = find_dsl_files(path)
+        if not dsl_files:
+            print(f"目录中没有找到DSL文件: {path}")
+            sys.exit(1)
+            
+        print(f"找到 {len(dsl_files)} 个DSL文件")
+        
+        # 执行所有DSL文件
+        failures = 0
+        for file_path in dsl_files:
+            success = execute_dsl_file(file_path, lexer, parser, executor)
+            if not success:
+                failures += 1
+        
+        # 最后执行目录的teardown文件（如果存在）
+        teardown_file = os.path.join(path, TEARDOWN_FILE_NAME)
+        if os.path.exists(teardown_file):
+            execute_hook_file(Path(teardown_file), False, path)
+        
+        # 如果有失败的测试，返回非零退出码
+        if failures > 0:
+            print(f"总计 {failures}/{len(dsl_files)} 个测试失败")
+            sys.exit(1)
+        else:
+            print(f"所有 {len(dsl_files)} 个测试成功完成")
+    else:
+        print(f"路径不存在: {path}")
         sys.exit(1)
 
 
 if __name__ == '__main__':
-    main() 
+    main() 

{pytest_dsl-0.3.0.dist-info → pytest_dsl-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-dsl
-Version: 0.3.0
+Version: 0.3.1
 Summary: A DSL testing framework based on pytest
 Author: Chen Shuanglin
 License: MIT

{pytest_dsl-0.3.0.dist-info → pytest_dsl-0.3.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pytest_dsl/__init__.py,sha256=FzwXGvmuvMhRBKxvCdh1h-yJ2wUOnDxcTbU4Nt5fHn8,301
-pytest_dsl/cli.py,sha256=9H2fEPjBbcPyodzIMwZWw-0iHvlkhpUvMO48Bnx_Kiw,2469
+pytest_dsl/cli.py,sha256=iMGfI2VuBI-ZAZrGfxVcBVtx9P_SMORuwbeMMOnDGXA,4774
 pytest_dsl/conftest_adapter.py,sha256=cevEb0oEZKTZfUrGe1-CmkFByxKhUtjuurBJP7kpLc0,149
 pytest_dsl/main_adapter.py,sha256=pUIPN_EzY3JCDlYK7yF_OeLDVqni8vtG15G7gVzPJXg,181
 pytest_dsl/parsetab.py,sha256=n_-2YnNszS-nq26HI8YbEBhvpNq7n_-092iXlsz34wA,8536
@@ -60,9 +60,9 @@ pytest_dsl/keywords/assertion_keywords.py,sha256=H0vNCvfG3h8R3ST6C5sVTEH8OTWj3x9
 pytest_dsl/keywords/global_keywords.py,sha256=RZcJ9ksfXZaRvds4247LFXu-8a0LFqTvVaD4n98GUrk,1410
 pytest_dsl/keywords/http_keywords.py,sha256=oGSdLYEGypYxTw6UFA1iHPaE6hRmeaoLfEoXbP_sIaI,25543
 pytest_dsl/keywords/system_keywords.py,sha256=3D6htXwoW2w0B3Ywtw1EBqffkGHAaUBoapG4-oJDJQQ,496
-pytest_dsl-0.3.0.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
-pytest_dsl-0.3.0.dist-info/METADATA,sha256=hFa0kDZlbUO302wac6QT7Vi0L9RkR-a7YUwXtY3K17E,11924
-pytest_dsl-0.3.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-pytest_dsl-0.3.0.dist-info/entry_points.txt,sha256=BWrYOFO9UgaDUTdS_W0G6Gl9YAj490cetXJsXrcjruA,94
-pytest_dsl-0.3.0.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
-pytest_dsl-0.3.0.dist-info/RECORD,,
+pytest_dsl-0.3.1.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
+pytest_dsl-0.3.1.dist-info/METADATA,sha256=X4FcqaJTrg8r17F20OJascFP77r4ZKYZ47m-k2KILIk,11924
+pytest_dsl-0.3.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+pytest_dsl-0.3.1.dist-info/entry_points.txt,sha256=BWrYOFO9UgaDUTdS_W0G6Gl9YAj490cetXJsXrcjruA,94
+pytest_dsl-0.3.1.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
+pytest_dsl-0.3.1.dist-info/RECORD,,