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

pytest_dsl/remote/variable_bridge.py

@@ -6,7 +6,8 @@
 
 import logging
 from typing import Any, Optional
-from pytest_dsl.remote.hook_manager import register_startup_hook, register_before_keyword_hook
+from pytest_dsl.remote.hook_manager import (register_startup_hook, 
+                                            register_before_keyword_hook)
 from pytest_dsl.core.yaml_vars import yaml_vars
 from pytest_dsl.core.global_context import global_context
 
@@ -43,24 +44,28 @@ class VariableBridge:
         
         self._bridge_installed = True
         logger.info("变量桥接机制已安装")
+        print(f"🔗 变量桥接机制已安装，可桥接 {len(shared_variables)} 个同步变量")
     
     def _bridged_yaml_get_variable(self, name: str) -> Optional[Any]:
         """桥接的YAML变量获取方法
         
         优先级：
-        1. 原始YAML变量
+        1. 原始YAML变量（服务器本地的）
         2. 客户端同步的变量
         """
         # 首先尝试从原始YAML变量获取
         original_value = self.original_yaml_get_variable(name)
         if original_value is not None:
+            logger.debug(f"从原始YAML获取变量: {name}")
             return original_value
         
         # 如果原始YAML中没有，尝试从同步变量获取
         if name in self.shared_variables:
             logger.debug(f"从同步变量获取YAML变量: {name}")
+            print(f"🔗 变量桥接: 从同步变量获取 {name}")
             return self.shared_variables[name]
         
+        logger.debug(f"变量 {name} 在原始YAML和同步变量中都不存在")
         return None
     
     def _bridged_global_get_variable(self, name: str) -> Any:
@@ -74,17 +79,20 @@ class VariableBridge:
             # 首先尝试从原始全局上下文获取
             original_value = self.original_global_get_variable(name)
             if original_value is not None:
+                logger.debug(f"从原始全局上下文获取变量: {name}")
                 return original_value
-        except:
+        except Exception as e:
             # 如果原始方法抛出异常，继续尝试同步变量
-            pass
+            logger.debug(f"原始全局上下文获取变量 {name} 失败，尝试同步变量: {e}")
         
         # 如果原始全局变量中没有，尝试从同步变量获取
         if name in self.shared_variables:
             logger.debug(f"从同步变量获取全局变量: {name}")
+            print(f"🔗 变量桥接: 从同步变量获取全局变量 {name}")
             return self.shared_variables[name]
         
         # 如果都没有找到，返回None（保持原有行为）
+        logger.debug(f"变量 {name} 在所有来源中都不存在")
         return None
     
     def uninstall_bridge(self):
@@ -113,6 +121,7 @@ def setup_variable_bridge(context):
     if shared_variables is not None:
         variable_bridge.install_bridge(shared_variables)
         logger.info("变量桥接机制已在服务器启动时安装")
+        print(f"🔗 服务器启动时安装变量桥接机制，可桥接 {len(shared_variables)} 个变量")
     else:
         logger.warning("无法获取shared_variables，变量桥接机制安装失败")
 
@@ -124,11 +133,14 @@ def ensure_variable_bridge(context):
     shared_variables = context.get('shared_variables')
     keyword_name = context.get('keyword_name')
     
-    # 只对特定关键字进行调试日志
-    if keyword_name in ['HTTP请求', '数据库查询'] and shared_variables:
+    # 对所有关键字进行调试日志（如果有同步变量）
+    if shared_variables and len(shared_variables) > 0:
         synced_count = len(shared_variables)
-        if synced_count > 0:
-            logger.debug(f"关键字 {keyword_name} 执行前，可用同步变量数量: {synced_count}")
+        logger.debug(f"关键字 {keyword_name} 执行前，可用同步变量数量: {synced_count}")
+        
+        # 对重要关键字显示详细信息
+        if keyword_name in ['HTTP请求', '数据库查询', 'API调用']:
+            print(f"🔗 关键字 {keyword_name} 可访问 {synced_count} 个同步变量")
 
 
 def get_synced_variable(name: str) -> Optional[Any]:
@@ -162,3 +174,24 @@ def has_synced_variable(name: str) -> bool:
         是否存在该同步变量
     """
     return name in variable_bridge.shared_variables
+
+
+def get_all_accessible_variables() -> dict:
+    """获取所有可访问的变量（包括原始变量和同步变量）
+    
+    Returns:
+        所有可访问变量的字典
+    """
+    all_vars = {}
+    
+    # 添加原始YAML变量
+    try:
+        if hasattr(yaml_vars, '_variables'):
+            all_vars.update(yaml_vars._variables)
+    except Exception as e:
+        logger.warning(f"获取原始YAML变量失败: {e}")
+    
+    # 添加同步变量（会覆盖同名的原始变量）
+    all_vars.update(variable_bridge.shared_variables)
+    
+    return all_vars

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-dsl
-Version: 0.11.0
+Version: 0.12.0
 Summary: A DSL testing framework based on pytest
 Author: Chen Shuanglin
 License: MIT
@@ -1038,7 +1038,7 @@ jobs:
 
     - name: Run tests
       run: |
-        pytest-dsl tests/ --yaml-vars config/ci.yaml --alluredir=allure-results
+        pytest test_runner.py --alluredir=allure-results
 
     - name: Generate report
       uses: simple-elf/allure-report-action@master
@@ -1097,7 +1097,7 @@ CMD ["pytest-dsl", "tests/", "--yaml-vars", "config/prod.yaml"]
 ### 适用场景
 
 - **API接口测试** - 完整的HTTP测试支持
-- **微服务测试** - 分布式测试能力
+- **分布式测试** - 跨服务调用、服务间通信和分布式系统测试
 - **回归测试** - 数据驱动和批量执行
 - **集成测试** - 跨系统测试协调
 - **性能测试** - 结合其他工具进行性能测试

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

@@ -1,5 +1,5 @@
 pytest_dsl/__init__.py,sha256=FzwXGvmuvMhRBKxvCdh1h-yJ2wUOnDxcTbU4Nt5fHn8,301
-pytest_dsl/cli.py,sha256=KBuSFwsdbRULxsVscR-2Hffoz-hwSLpJGSsxVnbqtbI,33895
+pytest_dsl/cli.py,sha256=clpvDtQ18tJHl0DUKhoAfCNROE3TB_t59z0fOn5VL9M,33404
 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
@@ -12,7 +12,7 @@ pytest_dsl/core/custom_keyword_manager.py,sha256=UdlGUc_mT8hIwmU7LVf4wJLG-geChwY
 pytest_dsl/core/dsl_executor.py,sha256=aEEfocFCFxNDN1puBFhQzL5fzw9eZx8BAyYJI5XSt4Y,30472
 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=1AHqtM_fkXf8JrM0ljMsJwUkyt-ysjR16NoyCckHfGc,15810
+pytest_dsl/core/http_client.py,sha256=hdx8gI4JCmq1-96pbiKeyKzSQUzPAi08cRNmljiPQmY,15536
 pytest_dsl/core/http_request.py,sha256=nGMlx0mFc7rDLIdp9GJ3e09OQH3ryUA56yJdRZ99dOQ,57445
 pytest_dsl/core/keyword_manager.py,sha256=hoNXHQcumnufPRUobnY0mnku4CHxSg2amwPFby4gQEs,7643
 pytest_dsl/core/lexer.py,sha256=WaLzt9IhtHiA90Fg2WGgfVztveCUhtgxzANBaEiy-F8,4347
@@ -57,17 +57,17 @@ 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=B2IoWZjmAk0bQf1o5hHhHEDHpAl010PrDVA4iJ1mLk0,25605
-pytest_dsl/keywords/system_keywords.py,sha256=e65Mzyt56FYmw0vHegajLUSLeEYVI9Y-WSB1h6SKKLo,12089
+pytest_dsl/keywords/http_keywords.py,sha256=z2Brqj1Mkufa_PlZZNwfKuYqkgJhnjsZw-7YNnbt2N4,27302
+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
-pytest_dsl/remote/keyword_client.py,sha256=doXmg2Aenx9SclKtd5bT3n-DkxGK3MnMRwn4dpdug8s,16848
-pytest_dsl/remote/keyword_server.py,sha256=7eRBHXyTC2AyXBeXMHOYLjgj570ioiAhnq4CuEnkak4,21386
-pytest_dsl/remote/variable_bridge.py,sha256=KG2xTZcUExb8kNL-rR-IPFJmYGfo7ciE4W7xzet59sw,5520
+pytest_dsl/remote/keyword_client.py,sha256=BL80MOaLroUi0v-9sLtkJ55g1R0Iw9SE1k11Ifwqx-I,17292
+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.11.0.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
-pytest_dsl-0.11.0.dist-info/METADATA,sha256=Xr_eldwYrWr12X9fQMl1BN9UlqJrT0UOw9AiQoLgQC4,29642
-pytest_dsl-0.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytest_dsl-0.11.0.dist-info/entry_points.txt,sha256=PLOBbH02OGY1XR1JDKIZB1Em87loUvbgMRWaag-5FhY,204
-pytest_dsl-0.11.0.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
-pytest_dsl-0.11.0.dist-info/RECORD,,
+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,,