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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (58) hide show
  1. {pytest_testkit-1.0.3a2/pytest_testkit.egg-info → pytest_testkit-1.0.3a5}/PKG-INFO +1 -1
  2. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pyproject.toml +1 -1
  3. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/base/ssh.py +6 -2
  4. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/common/environment/device.py +2 -1
  5. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5/pytest_testkit.egg-info}/PKG-INFO +1 -1
  6. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/LICENSE +0 -0
  7. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/MANIFEST.in +0 -0
  8. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/README.md +0 -0
  9. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/__init__.py +0 -0
  10. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/__init__.py +0 -0
  11. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/base/__init__.py +0 -0
  12. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/base/excel.py +0 -0
  13. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/base/ftp.py +0 -0
  14. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/base/local_exec.py +0 -0
  15. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/base/sftp.py +0 -0
  16. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/common/__init__.py +0 -0
  17. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/common/environment/__init__.py +0 -0
  18. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/common/environment/allocator.py +0 -0
  19. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/common/environment/manager.py +0 -0
  20. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/common/log/__init__.py +0 -0
  21. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/common/log/filters.py +0 -0
  22. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/common/log/infra_logger.py +0 -0
  23. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/common/log/manager.py +0 -0
  24. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/pre_action/__init__.py +0 -0
  25. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/pre_action/action.py +0 -0
  26. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/pre_action/exceptions.py +0 -0
  27. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/pre_action/registry.py +0 -0
  28. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/plugin.py +0 -0
  29. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit.egg-info/SOURCES.txt +0 -0
  30. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit.egg-info/dependency_links.txt +0 -0
  31. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit.egg-info/entry_points.txt +0 -0
  32. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit.egg-info/requires.txt +0 -0
  33. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit.egg-info/top_level.txt +0 -0
  34. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/requirements.txt +0 -0
  35. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/setup.cfg +0 -0
  36. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_collect_case_with_inifile.py +0 -0
  37. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_docker_proxy_creation.py +0 -0
  38. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_docker_proxy_exit_docker.py +0 -0
  39. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_docker_proxy_getitem.py +0 -0
  40. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_docker_proxy_integration.py +0 -0
  41. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_docker_proxy_is_interactive_shell.py +0 -0
  42. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_docker_proxy_non_shell_commands.py +0 -0
  43. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_docker_proxy_sendcmd.py +0 -0
  44. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_docker_proxy_sendcmd_interactive.py +0 -0
  45. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_env_nodes_filter.py +0 -0
  46. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_get_inifile_info.py +0 -0
  47. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_get_item_case_info.py +0 -0
  48. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_local_exec.py +0 -0
  49. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_local_interactive.py +0 -0
  50. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_log_factory.py +0 -0
  51. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_log_factory_integration.py +0 -0
  52. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_security_features.py +0 -0
  53. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_ssh_cwd.py +0 -0
  54. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_ssh_file_ops.py +0 -0
  55. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_ssh_ignore_err.py +0 -0
  56. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_ssh_only_stdout.py +0 -0
  57. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_ssh_remove_command_echo.py +0 -0
  58. {pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/tests/test_ssh_success.py +0 -0
{pytest_testkit-1.0.3a2/pytest_testkit.egg-info → pytest_testkit-1.0.3a5}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pytest_testkit
3
- Version: 1.0.3a2
3
+ Version: 1.0.3a5
4
4
  Summary: Pytest plugin for Infra logging framework and environment management
5
5
  Author: Huawei
6
6
  License: MIT License
{pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pyproject.toml RENAMED
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "pytest_testkit"
7
- version = "1.0.3a2"
7
+ version = "1.0.3a5"
8
8
  description = "Pytest plugin for Infra logging framework and environment management"
9
9
  readme = "README.md"
10
10
  license = { file = "LICENSE" }
{pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/base/ssh.py RENAMED
@@ -46,7 +46,10 @@ class SshCmdInteractiveParam:
46
46
 
47
47
  class Ssh:
48
48
  # 提示符核心格式：匹配各种 shell 提示符的 $ 或 # 符号前的部分
49
- _PROMPT_CORE = r"(?:\[.+@.+\s+.+\]|[^@]+@[^:]+:.+|bash-[0-9.]+|sh-[0-9.]+)[#$]"
49
+ _PROMPT_CORE = (
50
+ r"(?:\[.+@.+\s+.+\]|[^@\s]+@[\w.-]+\s+.+|[^@]+@[^:]+:.+|"
51
+ r"bash-[0-9.]+|sh-[0-9.]+)[#$]"
52
+ )
50
53
  # 完整提示符模式：可选的虚拟环境前缀 + 核心提示符
51
54
  _PROMPT_PATTERN = re.compile(rf"^(\([^)]+\)\s*)*{_PROMPT_CORE}\s*$")
52
55
 
@@ -183,7 +186,8 @@ class Ssh:
183
186
  str: 识别到的提示符, 未识别返回空串
184
187
  """
185
188
  prompt_regex = re.compile(
186
- r"^\s*((?:\([^)]+\)\s*)*(?:\[.+@.+\s+.+\]|[^@\s]+@[^:\s]+:[^\s]*|"
189
+ r"^\s*((?:\([^)]+\)\s*)*(?:\[.+@.+\s+.+\]|"
190
+ r"[^@\s]+@[\w.-]+\s+.+|[^@\s]+@[^:\s]+:[^\s]*|"
187
191
  r"bash-[0-9.]+|sh-[0-9.]+)[#$]|[$#%>])\s*$",
188
192
  re.MULTILINE,
189
193
  )
{pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5}/pytest_testkit/lib/common/environment/device.py RENAMED
@@ -809,7 +809,8 @@ class Device:
809
809
  if stdout_val.endswith(new_prompt):
810
810
  result_dict["stdout"] = stdout_val[: -len(new_prompt)]
811
811
 
812
- logger.info(f"test tzing: {result_dict}")
812
+ logger.info(f"test tzing1: {new_prompt}")
813
+ logger.info(f"test tzing2: {result_dict}")
813
814
 
814
815
  # 按用户原始 only_stdout 决定返回值
815
816
  if only_stdout:
{pytest_testkit-1.0.3a2 → pytest_testkit-1.0.3a5/pytest_testkit.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pytest_testkit
3
- Version: 1.0.3a2
3
+ Version: 1.0.3a5
4
4
  Summary: Pytest plugin for Infra logging framework and environment management
5
5
  Author: Huawei
6
6
  License: MIT License