pytest-dsl 0.12.0__py3-none-any.whl → 0.13.0__py3-none-any.whl

pytest_dsl/keywords/http_keywords.py

@@ -130,7 +130,8 @@ def _load_file_content(file_path: str, is_template: bool = False,
 
 
 def _process_request_config(config: Dict[str, Any],
-                            test_context: TestContext = None) -> Dict[str, Any]:
+                            test_context: TestContext = None) -> \
+        Dict[str, Any]:
     """处理请求配置，检查并处理文件引用
 
     Args:
@@ -219,7 +220,15 @@ def _normalize_retry_config(config, assert_retry_count=None,
         if 'indices' in retry_assertions:
             standard_retry_config['indices'] = retry_assertions['indices']
         if 'specific' in retry_assertions:
-            standard_retry_config['specific'] = retry_assertions['specific']
+            # 确保specific配置中的整数键被转换为字符串键，保持兼容性
+            specific_config = {}
+            for key, value in retry_assertions['specific'].items():
+                # 同时支持整数键和字符串键
+                specific_config[str(key)] = value
+                # 保留原始键类型以便查找
+                if isinstance(key, int):
+                    specific_config[key] = value
+            standard_retry_config['specific'] = specific_config
 
     # 处理传统retry配置（如果专用配置不存在）
     elif 'retry' in config and config['retry']:
@@ -360,7 +369,17 @@ def http_request(context, **kwargs):
         # 执行请求
         response = http_req.execute(disable_auth=disable_auth)
 
-        # 处理捕获
+        # 统一处理断言逻辑
+        with allure.step("执行断言验证"):
+            if retry_config['enabled']:
+                # 使用统一的重试处理函数
+                _process_assertions_with_unified_retry(http_req, retry_config,
+                                                       disable_auth)
+            else:
+                # 不需要重试，直接断言
+                http_req.process_asserts()
+
+        # 在断言完成后获取最终的捕获值（可能在重试期间被更新）
         captured_values = http_req.captured_values
 
         # 将捕获的变量注册到上下文
@@ -371,15 +390,6 @@ def http_request(context, **kwargs):
         if save_response:
             context.set(save_response, response)
 
-        # 统一处理断言逻辑
-        with allure.step("执行断言验证"):
-            if retry_config['enabled']:
-                # 使用统一的重试处理函数
-                _process_assertions_with_unified_retry(http_req, retry_config)
-            else:
-                # 不需要重试，直接断言
-                http_req.process_asserts()
-
         # 获取会话状态（如果使用了会话）
         session_state = None
         if session_name:
@@ -447,7 +457,8 @@ def _deep_merge(dict1, dict2):
     return dict1
 
 
-def _process_assertions_with_unified_retry(http_req, retry_config):
+def _process_assertions_with_unified_retry(http_req, retry_config,
+                                           disable_auth=False):
     """使用统一的重试配置处理断言
 
     Args:
@@ -482,6 +493,11 @@ def _process_assertions_with_unified_retry(http_req, retry_config):
             # 临时替换配置
             http_req.config = temp_config
 
+            # 确保在收集失败断言之前，response和captures是可用的
+            if not http_req.response:
+                # 如果response为空，重新执行一次请求
+                http_req.execute(disable_auth=disable_auth)
+
             # 重新运行断言，这次只收集失败的断言而不抛出异常
             _, failed_retryable_assertions = http_req.process_asserts()
         except Exception as collect_err:
@@ -582,7 +598,17 @@ def _process_assertions_with_unified_retry(http_req, retry_config):
                 time.sleep(retry_interval)
 
                 # 重新发送请求
-                http_req.execute()
+                try:
+                    http_req.execute(disable_auth=disable_auth)
+                except Exception as exec_error:
+                    # 如果重新执行请求失败，记录错误并继续重试
+                    allure.attach(
+                        f"重试执行请求失败: {type(exec_error).__name__}: "
+                        f"{str(exec_error)}",
+                        name=f"重试请求执行失败 #{attempt}",
+                        attachment_type=allure.attachment_type.TEXT
+                    )
+                    continue
 
                 # 过滤出仍在重试范围内的断言
                 still_retryable_assertions = []
@@ -657,6 +683,8 @@ def _process_assertions_with_unified_retry(http_req, retry_config):
         )
 
         try:
+            # 确保在最终断言之前重新执行一次请求
+            http_req.execute(disable_auth=disable_auth)
             results, _ = http_req.process_asserts()
             return results
         except AssertionError as final_err:

pytest_dsl/plugin.py

@@ -5,11 +5,12 @@
 """
 import pytest
 import os
-from pathlib import Path
 
 # 导入模块化组件
 from pytest_dsl.core.yaml_loader import add_yaml_options, load_yaml_variables
-from pytest_dsl.core.plugin_discovery import load_all_plugins, scan_local_keywords
+from pytest_dsl.core.plugin_discovery import (
+    load_all_plugins, scan_local_keywords
+)
 from pytest_dsl.core.global_context import global_context
 
 
@@ -39,6 +40,23 @@ def pytest_configure(config):
 
     # 加载所有已安装的关键字插件
     load_all_plugins()
-    
+
     # 加载本地关键字（向后兼容）
-    scan_local_keywords() 
+    scan_local_keywords()
+
+    # 自动导入项目中的resources目录
+    try:
+        from pytest_dsl.core.custom_keyword_manager import custom_keyword_manager
+
+        # 获取pytest的根目录
+        project_root = str(config.rootdir) if config.rootdir else os.getcwd()
+
+        # 检查是否存在resources目录
+        resources_dir = os.path.join(project_root, "resources")
+        if os.path.exists(resources_dir) and os.path.isdir(resources_dir):
+            custom_keyword_manager.auto_import_resources_directory(
+                project_root)
+            print(f"pytest环境：已自动导入resources目录 {resources_dir}")
+
+    except Exception as e:
+        print(f"pytest环境：自动导入resources目录时出现警告: {str(e)}")

{pytest_dsl-0.12.0.dist-info → pytest_dsl-0.13.0.dist-info}/METADATA

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

{pytest_dsl-0.12.0.dist-info → pytest_dsl-0.13.0.dist-info}/RECORD

@@ -1,23 +1,23 @@
 pytest_dsl/__init__.py,sha256=FzwXGvmuvMhRBKxvCdh1h-yJ2wUOnDxcTbU4Nt5fHn8,301
-pytest_dsl/cli.py,sha256=clpvDtQ18tJHl0DUKhoAfCNROE3TB_t59z0fOn5VL9M,33404
+pytest_dsl/cli.py,sha256=kFGOoGQ3dzi5C895QPawnAkif6UmQ4f9zFZmmag0Zgo,34336
 pytest_dsl/conftest_adapter.py,sha256=cevEb0oEZKTZfUrGe1-CmkFByxKhUtjuurBJP7kpLc0,149
 pytest_dsl/main_adapter.py,sha256=pUIPN_EzY3JCDlYK7yF_OeLDVqni8vtG15G7gVzPJXg,181
-pytest_dsl/plugin.py,sha256=MEQcdK0xdxwxCxPEDLNHX_kGF9Jc7bNxlNi4mx588DU,1190
+pytest_dsl/plugin.py,sha256=Ymepaknms6N5mMoFgtiVi4YYiycE8a_6BPCBONmN-W8,1901
 pytest_dsl/core/__init__.py,sha256=ersUoxIWSrisxs9GX_STlH4XAbjNxAWUQB0NboaC5zI,322
 pytest_dsl/core/auth_provider.py,sha256=IZfXXrr4Uuc8QHwRPvhHSzNa2fwrqhjYts1xh78D39Q,14861
 pytest_dsl/core/auto_decorator.py,sha256=9Mga-GB4AzV5nkB6zpfaq8IuHa0KOH8LlFvnWyH_tnU,6623
 pytest_dsl/core/auto_directory.py,sha256=egyTnVxtGs4P75EIivRauLRPJfN9aZpoGVvp_Ma72AM,2714
 pytest_dsl/core/context.py,sha256=fXpVQon666Lz_PCexjkWMBBr-Xcd1SkDMp2vHar6eIs,664
-pytest_dsl/core/custom_keyword_manager.py,sha256=UdlGUc_mT8hIwmU7LVf4wJLG-geChwYgvcFM-KtPvJA,7512
-pytest_dsl/core/dsl_executor.py,sha256=aEEfocFCFxNDN1puBFhQzL5fzw9eZx8BAyYJI5XSt4Y,30472
+pytest_dsl/core/custom_keyword_manager.py,sha256=vFXRfKXOu7CxoLsLCd6B2TI_JgOrfnE8JN9iShdv_hw,12308
+pytest_dsl/core/dsl_executor.py,sha256=T-8_U3s3KD3HIZ0fWcydftOh9qAwWZDbSNxiT2SBDeA,32039
 pytest_dsl/core/dsl_executor_utils.py,sha256=cFoR2p3qQ2pb-UhkoefleK-zbuFqf0aBLh2Rlp8Ebs4,2180
 pytest_dsl/core/global_context.py,sha256=NcEcS2V61MT70tgAsGsFWQq0P3mKjtHQr1rgT3yTcyY,3535
 pytest_dsl/core/http_client.py,sha256=hdx8gI4JCmq1-96pbiKeyKzSQUzPAi08cRNmljiPQmY,15536
-pytest_dsl/core/http_request.py,sha256=nGMlx0mFc7rDLIdp9GJ3e09OQH3ryUA56yJdRZ99dOQ,57445
+pytest_dsl/core/http_request.py,sha256=6e-gTztH3wu2eSW27Nc0uPmyWjB6oBwndx8Vqnu5uyg,60030
 pytest_dsl/core/keyword_manager.py,sha256=hoNXHQcumnufPRUobnY0mnku4CHxSg2amwPFby4gQEs,7643
 pytest_dsl/core/lexer.py,sha256=WaLzt9IhtHiA90Fg2WGgfVztveCUhtgxzANBaEiy-F8,4347
-pytest_dsl/core/parser.py,sha256=xxy6yC6NdwHxln200aIuaWWN3w44uI8kkNlw8PTVpYI,11855
-pytest_dsl/core/parsetab.py,sha256=aN-2RRTr3MSbMyfe-9zOj_t96Xu84avE29GWqH6nqmg,31472
+pytest_dsl/core/parser.py,sha256=pZjbfvab-VLjGJ28AV-69Nrdom_F1L0hwO76TyTyC2s,11947
+pytest_dsl/core/parsetab.py,sha256=o4XbFKwpsi3fYmfI_F6u5NSM61Qp6gTx-Sfh1jDINxI,31767
 pytest_dsl/core/plugin_discovery.py,sha256=3pt3EXJ7EPF0rkUlyDZMVHkIiTy2vicdIIQJkrHXZjY,8305
 pytest_dsl/core/utils.py,sha256=q0AMdw5HO33JvlA3UJeQ7IXh1Z_8K1QlwiM1_yiITrU,5350
 pytest_dsl/core/variable_utils.py,sha256=sx5DFZAO_syi0E_0ACisiZUQL9yxGeOfNmMtV6w9V3E,13947
@@ -39,16 +39,16 @@ pytest_dsl/examples/http/__init__.py,sha256=TCV9NzLmBbPDwNpLQs4_s_LlX9T47ApQ5UAr
 pytest_dsl/examples/http/builtin_auth_test.auto,sha256=qZYpmxTBW018E5YQ4c8bbnoByEA3Y7BzpPfLJtDwMKQ,2374
 pytest_dsl/examples/http/file_reference_test.auto,sha256=lHDxuR9NWp-DdASRUt5xNlcOn7FtmLu6oAGDvSsMpeo,3870
 pytest_dsl/examples/http/http_advanced.auto,sha256=rVEtEY93rYcSrQJ7ntwW-GbHm8wltDobgd-KydIdVLU,2595
-pytest_dsl/examples/http/http_example.auto,sha256=y_5g6p3ydUoksovJd-21uAfKzcvvIA7iFJhyxx64rLc,4988
+pytest_dsl/examples/http/http_example.auto,sha256=g66-jQODonQeoVSRdggUIho6FGm5ON6Vqa0nuLDKG1o,4982
 pytest_dsl/examples/http/http_length_test.auto,sha256=GYlFtSj0Nfk_9aqQrCXvRlwvTJHOk9CIf8X1CV_VKJg,1972
-pytest_dsl/examples/http/http_retry_assertions.auto,sha256=zn3a54Mk4tpwi9l7qy3D4UWeci5kZJmQjXOoKuSQIwo,3332
-pytest_dsl/examples/http/http_retry_assertions_enhanced.auto,sha256=xIPGujQ1Oll1fi8LW1ZGuyAryu2RjK50_utA8cfKs88,3182
+pytest_dsl/examples/http/http_retry_assertions.auto,sha256=Dke5gkEZ9PTnKAhH86Umoo5DSh8P3RGjZN-gQSmrcBU,3385
+pytest_dsl/examples/http/http_retry_assertions_enhanced.auto,sha256=Y9Lt6KO9z799na-jtZGv6nrskOlM3CXVGPVo82SEmHM,3195
 pytest_dsl/examples/http/http_with_yaml.auto,sha256=u6Bw4EqQuQAMV-g2xS_iPmZwL4WRTpTqsJhL3xMRyfo,1942
-pytest_dsl/examples/http/new_retry_test.auto,sha256=XBTD3NnyVnKr23FVy6xa_5RJq76k8pUR3rFwZe30RRI,664
-pytest_dsl/examples/http/retry_assertions_only.auto,sha256=l2MNtJVhJ4vt3jsue1QsoyEAZrNcwyeINmHDfSEOgyk,1867
-pytest_dsl/examples/http/retry_config_only.auto,sha256=6zof7HvFdBG6SEZ_ZnHygsuu9hpRpFEj-z1uPwaCSSc,1479
-pytest_dsl/examples/http/retry_debug.auto,sha256=wHIGtkCG8p7x4KP1A1nuz6usroU1Pwfep5wkIffgEQo,854
-pytest_dsl/examples/http/retry_with_fix.auto,sha256=BU8HeFtY8xor9o9XV_h-yx45_ZP0iAS-Ec12FE_7fNA,649
+pytest_dsl/examples/http/new_retry_test.auto,sha256=8ALnUYsZDI9TryQ2zDUg1JJYy7KGWKNQaECqure_0ck,669
+pytest_dsl/examples/http/retry_assertions_only.auto,sha256=KhLnpGYIGz49VQZuXqcbKucEV4uW0mUWiQKg_MM80Vw,1887
+pytest_dsl/examples/http/retry_config_only.auto,sha256=jGlpOcJS9IkN9OSe3Hs4uIq5EwxCzIg_72q5HFJK8NI,1482
+pytest_dsl/examples/http/retry_debug.auto,sha256=5f32aYYpnNg98sl8-2arooHA4LI4870rkEGu8Z4UlE8,1136
+pytest_dsl/examples/http/retry_with_fix.auto,sha256=GUn4T9oPsOQTsxScBRJD-M_sQkS3k2HDFYShtJNH-9s,693
 pytest_dsl/examples/http/simple_retry.auto,sha256=Y7S8sR8VRjdk-iVJxcOD0Fb2tt_RO00BmA9eat3L0ks,569
 pytest_dsl/examples/http/vars.yaml,sha256=GO0x6kpaUYk90TSOxtXh_3RYcacw8-ogBv5nG72Lr9Y,1186
 pytest_dsl/examples/quickstart/api_basics.auto,sha256=SrDRBASqy5ZMXnmfczuKNCXoTijF54DChpeTrfsDtGQ,1544
@@ -57,7 +57,7 @@ pytest_dsl/examples/quickstart/loops.auto,sha256=ZNZ6qP636v8QMY8QRyTUBB43gWCsqHb
 pytest_dsl/keywords/__init__.py,sha256=5aiyPU_t1UiB2MEZ6M9ffOKnV1mFT_2YHxnZvyWaBNI,372
 pytest_dsl/keywords/assertion_keywords.py,sha256=obW06H_3AizsvEM_9VE2JVuwvgrNVqP1kUTDd3U1SMk,23240
 pytest_dsl/keywords/global_keywords.py,sha256=4yw5yeXoGf_4W26F39EA2Pp-mH9GiKGy2jKgFO9a_wM,2509
-pytest_dsl/keywords/http_keywords.py,sha256=z2Brqj1Mkufa_PlZZNwfKuYqkgJhnjsZw-7YNnbt2N4,27302
+pytest_dsl/keywords/http_keywords.py,sha256=baT_p04lOqZpfmOvBdPdzW2_KTikMEJmKPvpEx5sddU,28839
 pytest_dsl/keywords/system_keywords.py,sha256=hjsACYER87rseSj4thBFnjDqe6At5hBT4Gjifj4ulDE,24470
 pytest_dsl/remote/__init__.py,sha256=syRSxTlTUfdAPleJnVS4MykRyEN8_SKiqlsn6SlIK8k,120
 pytest_dsl/remote/hook_manager.py,sha256=0hwRKP8yhcnfAnrrnZGVT-S0TBgo6c0A4qO5XRpvV1U,4899
@@ -65,9 +65,9 @@ pytest_dsl/remote/keyword_client.py,sha256=BL80MOaLroUi0v-9sLtkJ55g1R0Iw9SE1k11I
 pytest_dsl/remote/keyword_server.py,sha256=vGIE3Bhh461xX_u1U-Cf5nrWL2GQFYdtQdcMWfFIYgE,22320
 pytest_dsl/remote/variable_bridge.py,sha256=dv-d3Gq9ttvvrXM1fdlLtoSOPB6vRp0_GBOwX4wvcy8,7121
 pytest_dsl/templates/keywords_report.html,sha256=7x84iq6hi08nf1iQ95jZ3izcAUPx6JFm0_8xS85CYws,31241
-pytest_dsl-0.12.0.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
-pytest_dsl-0.12.0.dist-info/METADATA,sha256=M9J5LQQtA4aCQ3KqCRxjgiDcnZnMc_f_0Yctx91ZpvI,29655
-pytest_dsl-0.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytest_dsl-0.12.0.dist-info/entry_points.txt,sha256=PLOBbH02OGY1XR1JDKIZB1Em87loUvbgMRWaag-5FhY,204
-pytest_dsl-0.12.0.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
-pytest_dsl-0.12.0.dist-info/RECORD,,
+pytest_dsl-0.13.0.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
+pytest_dsl-0.13.0.dist-info/METADATA,sha256=Z3ywUBY2yKn3V6BouBNFEcZ1l1D6I-_S2-NLCGBcGeE,29655
+pytest_dsl-0.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytest_dsl-0.13.0.dist-info/entry_points.txt,sha256=PLOBbH02OGY1XR1JDKIZB1Em87loUvbgMRWaag-5FhY,204
+pytest_dsl-0.13.0.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
+pytest_dsl-0.13.0.dist-info/RECORD,,