pytest-testkit 1.0.3__tar.gz → 1.0.3a2__tar.gz

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

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

{pytest_testkit-1.0.3 → pytest_testkit-1.0.3a2}/pyproject.toml

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

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

@@ -772,13 +772,11 @@ class Device:
             result_dict = ssh_connect.ssh_cmd_interactive(param)
 
         # 发送命令日志: HTML location 列显示 sendcmd[设备短名],
-        # 消息带上 shell 提示符还原终端效果
+        # 消息不带 shell 提示符只打印命令本身
+        new_prompt = getattr(ssh_connect, "last_prompt", "") if ssh_connect else ""
         if echo_output and not _SESSION_QUIET_STDOUT:
             node_tag = f"[{_short_name(self.name)}]"
-            prompt = getattr(ssh_connect, "last_prompt", "") if ssh_connect else ""
-            # root@lease-env1792052573-5446-nodes1-device1792052573-2811:~#ls -l
-            # 打印回显如上 需要带上 shell 提示符吗
-            send_msg = f"{prompt}{cmd}" if prompt else cmd
+            send_msg = cmd
             if cwd is not None:
                 send_msg += f"    (cwd: {cwd})"
             logger.info(
@@ -796,9 +794,6 @@ class Device:
                 echo_parts.append(stderr)
             result_echo = "\n".join(echo_parts)
             if result_echo:
-                new_prompt = (
-                    getattr(ssh_connect, "last_prompt", "") if ssh_connect else ""
-                )
                 # 回显结果以shell提示符结尾移除它, 没有提示符则直接打印不拼装
                 if new_prompt and result_echo.endswith(new_prompt):
                     recv_msg = result_echo[: -len(new_prompt)].rstrip("\n")
@@ -808,6 +803,14 @@ class Device:
             else:
                 logger.info("(empty)", extra={"op_type": f"recvcmd{node_tag}"})
 
+        # 移除 stdout 末尾的 shell 提示符
+        if new_prompt:
+            stdout_val = result_dict.get("stdout", "") or ""
+            if stdout_val.endswith(new_prompt):
+                result_dict["stdout"] = stdout_val[: -len(new_prompt)]
+
+        logger.info(f"test tzing: {result_dict}")
+
         # 按用户原始 only_stdout 决定返回值
         if only_stdout:
             return result_dict.get("stdout", "")
@@ -1079,10 +1082,11 @@ 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)}]"},
-                )
+                # # 移除 放到调度日志中
+                # logger.info(
+                #     f"Disconnected from {self.__str__()}",
+                #     extra={"op_type": f"disconnect[{_short_name(self.name)}]"},
+                # )
 
                 return True
         except Exception as e:

{pytest_testkit-1.0.3 → pytest_testkit-1.0.3a2}/pytest_testkit/plugin.py

@@ -1064,7 +1064,7 @@ 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")
+            # logger.info(f"Released test environments")
 
         result = getattr(item, "infra_test_result", "unknown")
 

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

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