pytest-testkit 1.0.3a3__tar.gz → 1.1.0__tar.gz

{pytest_testkit-1.0.3a3/pytest_testkit.egg-info → pytest_testkit-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest_testkit
-Version: 1.0.3a3
+Version: 1.1.0
 Summary: Pytest plugin for Infra logging framework and environment management
 Author: Huawei
 License: MIT License

{pytest_testkit-1.0.3a3 → pytest_testkit-1.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytest_testkit"
-version = "1.0.3a3"
+version = "1.1.0"
 description = "Pytest plugin for Infra logging framework and environment management"
 readme = "README.md"
 license = { file = "LICENSE" }

{pytest_testkit-1.0.3a3 → pytest_testkit-1.1.0}/pytest_testkit/__init__.py

@@ -8,7 +8,7 @@ This plugin provides:
 - Pre-action registration for test setup execution
 """
 
-__version__ = "1.0.0"
+__version__ = "1.1.0"
 __author__ = "Huawei"
 
 from pytest_testkit.lib.common import log

{pytest_testkit-1.0.3a3 → pytest_testkit-1.1.0}/pytest_testkit/lib/base/sftp.py

@@ -58,7 +58,7 @@ class Sftp:
                 hostname=self.jump_ip,
                 port=self.jump_port,
                 username=self.jump_user,
-                password=self.target_pwd,
+                password=self.jump_pwd,
                 pkey=self.private_k,
                 timeout=10,
             )

{pytest_testkit-1.0.3a3 → pytest_testkit-1.1.0}/pytest_testkit/lib/base/ssh.py

@@ -46,7 +46,10 @@ class SshCmdInteractiveParam:
 
 class Ssh:
     # 提示符核心格式：匹配各种 shell 提示符的 $ 或 # 符号前的部分
-    _PROMPT_CORE = r"(?:\[.+@.+\s+.+\]|[^@]+@[^:]+:.+|bash-[0-9.]+|sh-[0-9.]+)[#$]"
+    _PROMPT_CORE = (
+        r"(?:\[.+@.+\s+.+\]|[^@\s]+@[\w.-]+\s+.+|[^@]+@[^:]+:.+|"
+        r"bash-[0-9.]+|sh-[0-9.]+)[#$]"
+    )
     # 完整提示符模式：可选的虚拟环境前缀 + 核心提示符
     _PROMPT_PATTERN = re.compile(rf"^(\([^)]+\)\s*)*{_PROMPT_CORE}\s*$")
 
@@ -183,7 +186,8 @@ class Ssh:
             str: 识别到的提示符, 未识别返回空串
         """
         prompt_regex = re.compile(
-            r"^\s*((?:\([^)]+\)\s*)*(?:\[.+@.+\s+.+\]|[^@\s]+@[^:\s]+:[^\s]*|"
+            r"^\s*((?:\([^)]+\)\s*)*(?:\[.+@.+\s+.+\]|"
+            r"[^@\s]+@[\w.-]+\s+.+|[^@\s]+@[^:\s]+:[^\s]*|"
             r"bash-[0-9.]+|sh-[0-9.]+)[#$]|[$#%>])\s*$",
             re.MULTILINE,
         )

{pytest_testkit-1.0.3a3 → pytest_testkit-1.1.0}/pytest_testkit/lib/common/environment/device.py

@@ -30,6 +30,8 @@ class LogColor:
     # 类加载时根据终端支持情况设置颜色常量
     CYAN = "\033[36m" if _supports_color() else ""
     GREEN = "\033[32m" if _supports_color() else ""
+    RED = "\033[31m" if _supports_color() else ""
+    YELLOW = "\033[33m" if _supports_color() else ""
     RESET = "\033[0m" if _supports_color() else ""
 
 
@@ -593,13 +595,6 @@ class Device:
         if self._get_logged_in():
             return True
 
-        # 登录动作日志: HTML location 列显示 login[设备短名]
-        # 改成框架日志，不在此处打印
-        # logger.info(
-        #     f"Logging in to device: {self.name}",
-        #     extra={"op_type": f"login[{_short_name(self.name)}]"},
-        # )
-
         # Implement actual SSH connection logic
         # 由于有跳板机，需要先登录跳板机，再登录目标设备
         # 这里简化处理，直接使用目标设备信息
@@ -618,27 +613,12 @@ class Device:
         )
         login_result = self._thread_local.sshConnect.login()
         if login_result is False:
-            # 改成框架日志，不在此处打印 这个是否不用修改
-            # logger.error(
-            #     f"ssh login failed for {self.__str__()}",
-            #     extra={"op_type": f"loginresult[{_short_name(self.name)}]"},
-            # )
             return False
         self._set_logged_in(True)
-        # 改成框架日志，不在此处打印
-        # logger.info(
-        #     f"Successfully connected to {self.__str__()}",
-        #     extra={"op_type": f"loginresult[{_short_name(self.name)}]"},
-        # )
         # 登录后立即预创建交互 channel 并吸收 banner,
         # 保证 loginecho 出现在第一条 sendcmd 之前
         login_echo = self._thread_local.sshConnect.prepare_interactive_channel()
         if login_echo:
-            # 改成框架日志，不在此处打印
-            # logger.info(
-            #     login_echo,
-            #     extra={"op_type": f"loginecho[{_short_name(self.name)}]"},
-            # )
             self._thread_local.sshConnect._login_echo_logged = True
         return True
 
@@ -754,11 +734,6 @@ class Device:
             if getattr(ssh_connect, "login_echo", "") and not getattr(
                 ssh_connect, "_login_echo_logged", False
             ):
-                # 改成框架日志，不在此处打印
-                # logger.info(
-                #     ssh_connect.login_echo,
-                #     extra={"op_type": f"loginecho[{_short_name(self.name)}]"},
-                # )
                 ssh_connect._login_echo_logged = True
 
             param = SshCmdInteractiveParam(
@@ -799,9 +774,15 @@ class Device:
                     recv_msg = result_echo[: -len(new_prompt)].rstrip("\n")
                 else:
                     recv_msg = result_echo
-                logger.info(recv_msg, extra={"op_type": f"recvcmd{node_tag}"})
+                logger.info(
+                    f"{LogColor.YELLOW}{recv_msg}{LogColor.RESET}",
+                    extra={"op_type": f"recvcmd{node_tag}"},
+                )
             else:
-                logger.info("(empty)", extra={"op_type": f"recvcmd{node_tag}"})
+                logger.info(
+                    f"{LogColor.YELLOW}(empty){LogColor.RESET}",
+                    extra={"op_type": f"recvcmd{node_tag}"},
+                )
 
         # 移除 stdout 末尾的 shell 提示符
         if new_prompt:
@@ -809,9 +790,6 @@ class Device:
             if stdout_val.endswith(new_prompt):
                 result_dict["stdout"] = stdout_val[: -len(new_prompt)]
 
-        logger.info(f"test tzing1: {new_prompt}")
-        logger.info(f"test tzing2: {result_dict}")
-
         # 按用户原始 only_stdout 决定返回值
         if only_stdout:
             return result_dict.get("stdout", "")
@@ -1083,12 +1061,6 @@ class Device:
                 self._thread_local.sshConnect.close()
                 self._set_logged_in(False)
 
-                # # 移除 放到调度日志中
-                # logger.info(
-                #     f"Disconnected from {self.__str__()}",
-                #     extra={"op_type": f"disconnect[{_short_name(self.name)}]"},
-                # )
-
                 return True
         except Exception as e:
             logger.error(

{pytest_testkit-1.0.3a3 → pytest_testkit-1.1.0}/pytest_testkit/plugin.py

@@ -1064,7 +1064,6 @@ def pytest_runtest_teardown(item):
         if item.config.env_initialized and hasattr(item, "infra_environments"):
             env_manager = item.config.env_manager
             env_manager.release_environments(item.nodeid)
-            # logger.info(f"Released test environments")
 
         result = getattr(item, "infra_test_result", "unknown")
 

{pytest_testkit-1.0.3a3 → pytest_testkit-1.1.0/pytest_testkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest_testkit
-Version: 1.0.3a3
+Version: 1.1.0
 Summary: Pytest plugin for Infra logging framework and environment management
 Author: Huawei
 License: MIT License