sercomm-printserver 0.2.1__tar.gz → 0.2.2__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 (172) hide show
  1. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/CHANGELOG.md +21 -3
  2. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/PKG-INFO +6 -6
  3. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/docs/Manual-PS301.md +7 -1
  4. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/docs/systemdesign/module_reference.md +2 -1
  5. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/pyproject.toml +10 -15
  6. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/__init__conf__.py +1 -1
  7. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/raw/printer.py +55 -5
  8. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_adapter_neighbors.py +1 -1
  9. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_adapter_raw.py +52 -6
  10. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_adapter_telnet.py +11 -9
  11. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_arp_trick.py +4 -2
  12. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_overrides.py +1 -1
  13. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_validation.py +1 -1
  14. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_e2e_device.py +1 -1
  15. sercomm_printserver-0.2.2/tests/test_e2e_printer.py +159 -0
  16. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_permission_defaults.py +3 -3
  17. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_print_server.py +1 -1
  18. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_public_api.py +2 -2
  19. sercomm_printserver-0.2.2/tests/test_tcp_fixture_portability.py +153 -0
  20. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/.gitignore +0 -0
  21. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/CONFIG.md +0 -0
  22. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/LICENSE +0 -0
  23. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/README.md +0 -0
  24. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/docs/adr/0001-memory-adapters-in-src.md +0 -0
  25. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/docs/config-keys.md +0 -0
  26. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/docs/device-dump/CONFIG.txt +0 -0
  27. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/docs/device-dump/PSINF-factory.txt +0 -0
  28. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/docs/device-dump/PSINF.txt +0 -0
  29. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/docs/device-dump/fw6a10/CONFIG.txt +0 -0
  30. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/docs/device-dump/telnet-monitor.txt +0 -0
  31. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/docs/plans/2026-10-23-library-design.md +0 -0
  32. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/__init__.py +0 -0
  33. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/__main__.py +0 -0
  34. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/__init__.py +0 -0
  35. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/__init__.py +0 -0
  36. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/commands/__init__.py +0 -0
  37. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/commands/_device.py +0 -0
  38. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/commands/arp.py +0 -0
  39. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/commands/config.py +0 -0
  40. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/commands/device.py +0 -0
  41. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/commands/device_config.py +0 -0
  42. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/commands/discover.py +0 -0
  43. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/commands/info.py +0 -0
  44. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/commands/printing.py +0 -0
  45. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/config_load.py +0 -0
  46. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/constants.py +0 -0
  47. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/context.py +0 -0
  48. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/envelope.py +0 -0
  49. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/exit_codes.py +0 -0
  50. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/main.py +0 -0
  51. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/py.typed +0 -0
  52. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/root.py +0 -0
  53. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/safe_console.py +0 -0
  54. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/cli/typed_click.py +0 -0
  55. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/__init__.py +0 -0
  56. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/defaultconfig.d/40-layered-config.toml +0 -0
  57. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/defaultconfig.d/50-device.toml +0 -0
  58. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/defaultconfig.d/90-logging.toml +0 -0
  59. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/defaultconfig.toml +0 -0
  60. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/deploy.py +0 -0
  61. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/device_settings.py +0 -0
  62. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/display.py +0 -0
  63. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/loader.py +0 -0
  64. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/overrides.py +0 -0
  65. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/config/py.typed +0 -0
  66. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/discovery/__init__.py +0 -0
  67. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/discovery/py.typed +0 -0
  68. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/discovery/scanner.py +0 -0
  69. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/ftp/__init__.py +0 -0
  70. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/ftp/client.py +0 -0
  71. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/ftp/py.typed +0 -0
  72. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/logging/__init__.py +0 -0
  73. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/logging/py.typed +0 -0
  74. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/logging/setup.py +0 -0
  75. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/lpd/__init__.py +0 -0
  76. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/lpd/client.py +0 -0
  77. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/lpd/py.typed +0 -0
  78. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/memory/__init__.py +0 -0
  79. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/memory/config.py +0 -0
  80. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/memory/device.py +0 -0
  81. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/memory/discovery.py +0 -0
  82. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/memory/logging.py +0 -0
  83. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/memory/neighbors.py +0 -0
  84. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/neighbors/__init__.py +0 -0
  85. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/neighbors/py.typed +0 -0
  86. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/neighbors/table.py +0 -0
  87. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/py.typed +0 -0
  88. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/raw/__init__.py +0 -0
  89. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/raw/py.typed +0 -0
  90. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/snmp/__init__.py +0 -0
  91. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/snmp/py.typed +0 -0
  92. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/snmp/uptime.py +0 -0
  93. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/telnet/__init__.py +0 -0
  94. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/telnet/client.py +0 -0
  95. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/telnet/iac.py +0 -0
  96. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/telnet/py.typed +0 -0
  97. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/tftp/__init__.py +0 -0
  98. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/tftp/client.py +0 -0
  99. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/adapters/tftp/py.typed +0 -0
  100. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/application/__init__.py +0 -0
  101. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/application/arp_trick.py +0 -0
  102. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/application/discovery.py +0 -0
  103. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/application/ports.py +0 -0
  104. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/application/print_server.py +0 -0
  105. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/application/py.typed +0 -0
  106. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/composition/__init__.py +0 -0
  107. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/composition/py.typed +0 -0
  108. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/__init__.py +0 -0
  109. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/config_catalogue.py +0 -0
  110. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/config_codec.py +0 -0
  111. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/config_lines.py +0 -0
  112. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/config_model.py +0 -0
  113. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/config_reader.py +0 -0
  114. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/config_types.py +0 -0
  115. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/config_writer.py +0 -0
  116. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/device_files.py +0 -0
  117. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/device_info.py +0 -0
  118. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/endpoint.py +0 -0
  119. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/enums.py +0 -0
  120. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/errors.py +0 -0
  121. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/neighbor.py +0 -0
  122. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/port_status.py +0 -0
  123. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/domain/py.typed +0 -0
  124. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/entry.py +0 -0
  125. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/src/sercomm_printserver/py.typed +0 -0
  126. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/conftest.py +0 -0
  127. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/fake_ftp_server.py +0 -0
  128. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/fake_lpd_server.py +0 -0
  129. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/fake_raw_server.py +0 -0
  130. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/fake_telnet_server.py +0 -0
  131. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/fake_tftp_server.py +0 -0
  132. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/layer_roots.py +0 -0
  133. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_adapter_ftp.py +0 -0
  134. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_adapter_lpd.py +0 -0
  135. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_adapter_snmp.py +0 -0
  136. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_adapter_tftp.py +0 -0
  137. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cache_effectiveness.py +0 -0
  138. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_arp.py +0 -0
  139. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_config.py +0 -0
  140. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_config_errors.py +0 -0
  141. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_core.py +0 -0
  142. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_device.py +0 -0
  143. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_env_file.py +0 -0
  144. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_envelope.py +0 -0
  145. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_exit_codes.py +0 -0
  146. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_cli_main_exit.py +0 -0
  147. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_config_catalogue.py +0 -0
  148. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_config_codec.py +0 -0
  149. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_config_layer_isolation.py +0 -0
  150. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_config_overrides.py +0 -0
  151. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_coverage_database.py +0 -0
  152. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_declared_dependencies.py +0 -0
  153. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_deploy_mode_safety.py +0 -0
  154. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_deploy_permissions.py +0 -0
  155. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_device_reports.py +0 -0
  156. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_discovery.py +0 -0
  157. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_display.py +0 -0
  158. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_enums.py +0 -0
  159. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_errors.py +0 -0
  160. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_logging.py +0 -0
  161. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_logging_dotenv_isolation.py +0 -0
  162. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_memory_logging.py +0 -0
  163. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_metadata.py +0 -0
  164. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_metadata_sync.py +0 -0
  165. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_module_entry.py +0 -0
  166. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_packaging.py +0 -0
  167. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_platform_markers.py +0 -0
  168. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_port_status.py +0 -0
  169. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_ports.py +0 -0
  170. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_property_overrides.py +0 -0
  171. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_safe_console.py +0 -0
  172. {sercomm_printserver-0.2.1 → sercomm_printserver-0.2.2}/tests/test_settings_dotenv_numbers.py +0 -0
@@ -6,7 +6,25 @@ the [Keep a Changelog](https://keepachangelog.com/) format.
6
6
 
7
7
  ## [Unreleased]
8
8
 
9
- ## [0.2.1] 2026-10-27 10:41:44
9
+ ## [0.2.2] - 2026-10-30
10
+
11
+ ### Changed
12
+
13
+ - Requires `lib_log_rich>=8.1.2`, `lib_layered_config>=7.6.1` and `ipscout>=2.5.4`.
14
+ - The skill describes the RAW connect retry, the `--timeout` it needs, and how to tell a RAW port
15
+ stuck refusing from a device that is down.
16
+
17
+ ### Fixed
18
+
19
+ - `print raw` (and `RawPrinter.send`) retries a refused connect for up to 3 s, never longer than the
20
+ timeout, before reporting the device unreachable. A PS301 RAW port refuses a new connection for
21
+ about 1-2 s after the previous job closed, so the second of two jobs sent back to back failed
22
+ although nothing was wrong. Other connect errors still fail at once.
23
+ - When a RAW port refuses for the whole retry window, the error now says so and that a restart
24
+ (`reset`) clears a port stuck refusing. A PS301 has been measured refusing every RAW connect for
25
+ minutes while `status` showed the port idle, so the message is the only place this shows.
26
+
27
+ ## [0.2.1] - 2026-10-27
10
28
 
11
29
  ### Changed
12
30
 
@@ -30,7 +48,7 @@ the [Keep a Changelog](https://keepachangelog.com/) format.
30
48
  - An empty confirmation name no longer counts as repeating the empty server name of a reset
31
49
  device, so `factory-default`, `password clear` and `store-ip` refuse it there as everywhere.
32
50
 
33
- ## [0.2.0] 2026-10-26 18:46:01
51
+ ## [0.2.0] - 2026-10-26
34
52
 
35
53
  ### Changed
36
54
 
@@ -90,7 +108,7 @@ the [Keep a Changelog](https://keepachangelog.com/) format.
90
108
  and pyright's `extraPaths`, and gives pyright an execution environment rooted at `tests/`. A test
91
109
  checks that every doctest collected from `src/` gets both redirects.
92
110
 
93
- ## [0.1.0] 2026-10-24
111
+ ## [0.1.0] - 2026-10-24
94
112
 
95
113
  ### Added
96
114
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: sercomm-printserver
3
- Version: 0.2.1
3
+ Version: 0.2.2
4
4
  Summary: CLI and Python library for SerComm-based network print servers (PS301 and OEM variants)
5
5
  Project-URL: Homepage, https://github.com/bitranox/sercomm-printserver
6
6
  Project-URL: Repository, https://github.com/bitranox/sercomm-printserver.git
@@ -23,10 +23,10 @@ Classifier: Programming Language :: Python :: 3.15
23
23
  Classifier: Typing :: Typed
24
24
  Requires-Python: >=3.10
25
25
  Requires-Dist: click>=8.5.0
26
- Requires-Dist: ipscout>=2.5.2
26
+ Requires-Dist: ipscout>=2.5.4
27
27
  Requires-Dist: lib-cli-exit-tools>=2.4.1
28
- Requires-Dist: lib-layered-config>=7.3.0
29
- Requires-Dist: lib-log-rich>=8.0.1
28
+ Requires-Dist: lib-layered-config>=7.6.1
29
+ Requires-Dist: lib-log-rich>=8.1.2
30
30
  Requires-Dist: orjson>=3.13.0
31
31
  Requires-Dist: pydantic>=2.14.1
32
32
  Requires-Dist: python-dotenv>=1.2.4
@@ -34,7 +34,7 @@ Requires-Dist: rich-click>=1.9.9
34
34
  Provides-Extra: dev
35
35
  Requires-Dist: bandit>=1.9.4; extra == 'dev'
36
36
  Requires-Dist: build>=1.6.1; extra == 'dev'
37
- Requires-Dist: certifi>=2026.10.19; extra == 'dev'
37
+ Requires-Dist: certifi>=2026.10.23; extra == 'dev'
38
38
  Requires-Dist: click>=8.5.0; extra == 'dev'
39
39
  Requires-Dist: filelock>=4.2.4; (python_version >= '3.11') and extra == 'dev'
40
40
  Requires-Dist: hatchling>=1.32.4; extra == 'dev'
@@ -50,7 +50,7 @@ Requires-Dist: pytest-xdist>=3.8.0; extra == 'dev'
50
50
  Requires-Dist: pytest>=9.1.1; extra == 'dev'
51
51
  Requires-Dist: python-multipart>=0.0.32; extra == 'dev'
52
52
  Requires-Dist: rtoml>=0.14.0; extra == 'dev'
53
- Requires-Dist: ruff>=0.17.1; extra == 'dev'
53
+ Requires-Dist: ruff>=0.17.2; extra == 'dev'
54
54
  Requires-Dist: textual>=8.2.8; extra == 'dev'
55
55
  Requires-Dist: twine>=7.0.0; extra == 'dev'
56
56
  Requires-Dist: urllib3>=2.8.0; extra == 'dev'
@@ -397,7 +397,13 @@ Nicht heruntergeladen:
397
397
  `PS1P100.pdf`/`ps1p.pdf` (1-Port): offline (404), auch im Webarchiv nicht gefunden.
398
398
  - Netgear PS101 Reference Manual und PS101-Firmware: keine direkte URL (ManualsLib hat das
399
399
  Handbuch nur im Online-Viewer).
400
- - Firmware 6022 (die dieses Geräts) ist nirgends aufgetaucht.
400
+ - Firmware 6022 (die dieses Geräts) ist nirgends aufgetaucht, 6A10 (die des zweiten PS301)
401
+ ebenso wenig (gesucht 2026-10-29: Web, TRENDnet TE-310, Perle). Das einzige öffentliche
402
+ Image für ein Modell mit 2 par + 1 ser ist Perles `ioprint-2p1s6017.zip` (6017). Ob es auf
403
+ einem PS301 läuft, ist ungeprüft; Hardware-ID und OEM-Kennung können abweichen.
404
+ - Ob 6A10 älter oder neuer als 6022 ist, lässt sich nicht ablesen: Die Version ist keine
405
+ Dezimalzahl, und 6A10 fehlen `WINS_IP` und `DHCP_MODE`, die jedes untersuchte 60xx-Image
406
+ (6017 bis 6035) und der PS301 mit 6022 haben. Vermutlich ist 6A10 ein eigener Zweig, kein Nachfolger.
401
407
 
402
408
  ## Quellen
403
409
 
@@ -215,7 +215,8 @@ All under `tests/`:
215
215
  * CLI: `test_cli_device.py`, `test_cli_arp.py`, `test_cli_exit_codes.py`,
216
216
  `test_cli_main_exit.py`, `test_cli_core.py` and the config/override `test_cli_*.py` modules.
217
217
  * Real device: `test_e2e_device.py`, marker `device` (needs `SERCOMM_E2E=1` and
218
- `test-device.json`); marker `printer` also needs `SERCOMM_E2E_PRINTER=1`.
218
+ `test-device.json`); `test_e2e_printer.py`, marker `printer`, also needs
219
+ `SERCOMM_E2E_PRINTER=1` and a `printer` section in `test-device.json`.
219
220
 
220
221
  **Doctests:** `--doctest-modules`. **Platform markers:** `os_agnostic`, `os_windows`, `os_macos`,
221
222
  `os_posix`, `os_linux`; `local_only`, `integration`. **Coverage gate:** `fail_under = 80`.
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "sercomm-printserver"
3
- version = "0.2.1"
3
+ version = "0.2.2"
4
4
  description = "CLI and Python library for SerComm-based network print servers (PS301 and OEM variants)"
5
5
  readme = "README.md"
6
6
  requires-python = ">=3.10"
@@ -10,12 +10,12 @@ dependencies = [
10
10
  "click>=8.5.0",
11
11
  "lib_cli_exit_tools>=2.4.1",
12
12
  # 6.4.2: validate_config, the check config --profile runs, refuses exactly what init() refuses.
13
- "lib_log_rich>=8.0.1",
13
+ "lib_log_rich>=8.1.2",
14
14
  "python-dotenv>=1.2.4",
15
- "lib_layered_config>=7.3.0",
15
+ "lib_layered_config>=7.6.1",
16
16
  "pydantic>=2.14.1",
17
17
  "orjson>=3.13.0",
18
- "ipscout>=2.5.2",
18
+ "ipscout>=2.5.4",
19
19
  ]
20
20
  license = { text = "MIT" }
21
21
  authors = [{ name = "bitranox", email = "bitranox@gmail.com" }]
@@ -55,7 +55,7 @@ dev = [
55
55
  "pytest-cov>=7.1.0",
56
56
  "pytest-xdist>=3.8.0",
57
57
  "hypothesis>=6.168.5",
58
- "ruff>=0.17.1",
58
+ "ruff>=0.17.2",
59
59
  "pyright[nodejs]>=1.1.414",
60
60
  "bandit>=1.9.4",
61
61
  "build>=1.6.1",
@@ -83,7 +83,7 @@ dev = [
83
83
  "pynacl>=1.6.2", # CVE-2025-69277
84
84
  "urllib3>=2.8.0", # CVE-2025-66471, CVE-2025-66418
85
85
  "virtualenv>=21.14.13", # CVE-2025-22702, CVE-2026-113722, CVE-2026-113713, CVE-2026-115586
86
- "certifi>=2026.10.19", # PYSEC-2026-4320
86
+ "certifi>=2026.10.23", # PYSEC-2026-4320
87
87
  "filelock>=4.2.4; python_version>='3.11'", # CVE-2026-112906, -112914, -112940; no fixed release supports 3.10
88
88
  ]
89
89
 
@@ -292,15 +292,10 @@ layers = [
292
292
  ]
293
293
 
294
294
  [tool.pip-audit]
295
- # Known vulnerabilities to ignore (environment-level packages, not project dependencies)
296
- # PYSEC-2022-42969: py library ReDoS - py 1.11.0 is installed in the development
297
- # environment but is not a dependency of this project; no fix available.
298
- ignore-vulns = [
299
- "PYSEC-2022-42969", # py 1.11.0 - ReDoS, env-only, no fix available
300
- "CVE-2025-8869", # pip 24.3.1 - env-only, not a project dependency
301
- "CVE-2026-1703", # pip 24.3.1 - env-only, not a project dependency
302
- "CVE-2026-25990", # pillow 12.0.0 - env-only, fix in 12.1.1
303
- ]
295
+ # Vulnerability ids pip-audit should ignore; CI and bmk pass each one as --ignore-vuln.
296
+ # Empty: a CVE is fixed by raising a floor in [project.optional-dependencies].dev, or by
297
+ # removing the dependency that caps the fix, before an id ever goes here.
298
+ ignore-vulns = []
304
299
 
305
300
  [tool.bashate]
306
301
  # bashate style settings for .sh files (E003 excluded: indent handled by shfmt)
@@ -40,7 +40,7 @@ name = "sercomm-printserver"
40
40
  #: Human-readable summary shown in CLI help output.
41
41
  title = "CLI and Python library for SerComm-based network print servers (PS301 and OEM variants)"
42
42
  #: Current release version pulled from ``pyproject.toml`` by automation.
43
- version = "0.2.1"
43
+ version = "0.2.2"
44
44
  #: Repository homepage presented to users.
45
45
  homepage = "https://github.com/bitranox/sercomm-printserver"
46
46
  #: Author attribution surfaced in CLI output.
@@ -13,6 +13,9 @@ Device behaviour this adapter is shaped by (measured on a PS301, firmware 6022):
13
13
  * A RAW port belongs to a logical printer, not to a physical port: 9100-9102 and the vendor's
14
14
  DSI sockets 4010/4020/4030 both reach L1..L3, and the data goes wherever that printer is
15
15
  routed (``Ln_PROUT``). The caller names the port.
16
+ * After a job's connection closes, the port refuses a new connect for about 1-2 s. A refused
17
+ connect is therefore retried for a short window before the device counts as unreachable, so
18
+ two jobs sent back to back both arrive. Other connect errors are not retried.
16
19
 
17
20
  A device that keeps its side open after the job is not an error: the data was delivered, so a
18
21
  timeout while waiting for its close returns normally.
@@ -21,6 +24,7 @@ timeout while waiting for its close returns normally.
21
24
  from __future__ import annotations
22
25
 
23
26
  import socket
27
+ import time
24
28
  from typing import TYPE_CHECKING, Final
25
29
 
26
30
  from ...domain.errors import DeviceUnavailableError
@@ -35,6 +39,11 @@ _RECV_SIZE: Final = 4096
35
39
  _DRAIN_LIMIT: Final = 64 * 1024
36
40
  _MIN_PORT: Final = 1
37
41
  _MAX_PORT: Final = 65535
42
+ #: Longest time a refused connect is retried (never longer than the endpoint's timeout). The
43
+ #: PS301 refuses for about 1-2 s after the previous job closed, so 3 s covers it with margin
44
+ #: while a port that is really closed still fails quickly.
45
+ _REFUSED_RETRY_SECONDS: Final = 3.0
46
+ _REFUSED_RETRY_INTERVAL: Final = 0.25
38
47
 
39
48
 
40
49
  def _check_arguments(port: int, data: bytes) -> None:
@@ -46,14 +55,52 @@ def _check_arguments(port: int, data: bytes) -> None:
46
55
 
47
56
 
48
57
  def _connect(host: str, port: int, timeout: float) -> socket.socket:
49
- """Open the TCP connection, mapping every failure to ``DeviceUnavailableError``."""
58
+ """Open the TCP connection, mapping every failure to ``DeviceUnavailableError``.
59
+
60
+ A refusal that outlasts the retry window gets its own message: a PS301 RAW port has been
61
+ measured refusing every connect for minutes while the Telnet monitor showed the port idle,
62
+ so ``status`` cannot reveal that state and the message is the one place that says a restart
63
+ clears it. A port that is simply closed refuses the same way, hence "may".
64
+ """
50
65
  try:
51
- return socket.create_connection((host, port), timeout=timeout)
66
+ return _connect_retrying_refusals(host, port, timeout)
67
+ except ConnectionRefusedError as exc:
68
+ window = min(timeout, _REFUSED_RETRY_SECONDS)
69
+ raise DeviceUnavailableError(
70
+ f"{host}:{port} refused every connection for {window:g} s ({exc}). If this is the RAW "
71
+ "port of a print server that otherwise answers, the port may be stuck refusing; "
72
+ "status does not show that state, and a restart (reset) clears it"
73
+ ) from exc
52
74
  except (OSError, UnicodeError) as exc:
53
75
  # UnicodeError: the IDNA codec refuses a malformed host name before any socket exists.
54
76
  raise DeviceUnavailableError(f"{host}:{port} could not be reached: {exc}") from exc
55
77
 
56
78
 
79
+ def _connect_retrying_refusals(host: str, port: int, timeout: float) -> socket.socket:
80
+ """Connect, retrying a refused connect until the retry window closes.
81
+
82
+ The last attempt catches nothing, so a port that keeps refusing raises its own
83
+ ``ConnectionRefusedError`` and the caller's message names the real cause. Windows retries a
84
+ refused SYN itself and reports the refusal only after about 2 s (measured 2.07 s), so there a
85
+ ``timeout`` below that ends each attempt as a plain timeout, which is not retried.
86
+ """
87
+ deadline = time.monotonic() + min(timeout, _REFUSED_RETRY_SECONDS)
88
+ while time.monotonic() + _REFUSED_RETRY_INTERVAL < deadline:
89
+ sock = _connect_unless_refused(host, port, timeout)
90
+ if sock is not None:
91
+ return sock
92
+ time.sleep(_REFUSED_RETRY_INTERVAL)
93
+ return socket.create_connection((host, port), timeout=timeout)
94
+
95
+
96
+ def _connect_unless_refused(host: str, port: int, timeout: float) -> socket.socket | None:
97
+ """Connect once; ``None`` when the port refused, every other error propagates."""
98
+ try:
99
+ return socket.create_connection((host, port), timeout=timeout)
100
+ except ConnectionRefusedError:
101
+ return None
102
+
103
+
57
104
  def _transmit(sock: socket.socket, data: bytes, *, address: str) -> None:
58
105
  """Send every byte, counting them so a broken connection says how far the job got.
59
106
 
@@ -110,14 +157,17 @@ class RawPrinter:
110
157
  """Connect to ``port``, send ``data``, half-close and wait for the device to close.
111
158
 
112
159
  Args:
113
- endpoint: The device; ``host`` and ``timeout`` are used. ``timeout`` bounds the
114
- connect, each send and the wait for the device's close.
160
+ endpoint: The device; ``host`` and ``timeout`` are used. ``timeout`` bounds each
161
+ connect attempt, each send and the wait for the device's close; a refused
162
+ connect is retried for up to 3 s, never longer than ``timeout``.
115
163
  port: The RAW TCP port (9100-9102 or 4010/4020/4030 for L1..L3).
116
164
  data: The print data, sent unchanged.
117
165
 
118
166
  Raises:
119
167
  ValueError: ``data`` is empty or ``port`` is outside 1..65535; nothing is sent.
120
- DeviceUnavailableError: The device could not be reached, or broke the connection;
168
+ DeviceUnavailableError: The device could not be reached, or refused every connect
169
+ for the whole retry window (the message then points at a restart), or broke the
170
+ connection;
121
171
  the message says how many bytes were sent.
122
172
  """
123
173
  _check_arguments(port, data)
@@ -61,7 +61,7 @@ def test_an_unprivileged_write_becomes_a_host_privilege_error() -> None:
61
61
  if route is None or route.interface is None:
62
62
  pytest.skip("no default route to borrow an interface from")
63
63
 
64
- with pytest.raises(HostPrivilegeError, match="CAP_NET_ADMIN"):
64
+ with pytest.raises(HostPrivilegeError, match="changing the neighbour table needs root or CAP_NET_ADMIN"):
65
65
  IpscoutNeighborTable(interface=route.interface).set_static(_IP, _MAC)
66
66
 
67
67
 
@@ -4,10 +4,12 @@ from __future__ import annotations
4
4
 
5
5
  import re
6
6
  import socket
7
+ import threading
7
8
  import time
8
9
  from typing import TYPE_CHECKING
9
10
 
10
11
  import pytest
12
+ from fake_lpd_server import closed_port
11
13
  from fake_raw_server import FakeRawServer, RawBehaviour
12
14
 
13
15
  from sercomm_printserver.adapters.raw import RawPrinter
@@ -106,13 +108,57 @@ def test_a_reset_mid_stream_is_unavailable_and_says_how_far_the_job_got() -> Non
106
108
 
107
109
 
108
110
  def test_a_refused_connection_is_unavailable_and_names_the_address() -> None:
109
- # A bound socket that never listens refuses connects, and holding it keeps the port ours.
110
- with socket.socket() as closed_port:
111
- closed_port.bind(("127.0.0.1", 0))
112
- port = closed_port.getsockname()[1]
111
+ port = closed_port()
113
112
 
114
- with pytest.raises(DeviceUnavailableError, match=re.escape(f"127.0.0.1:{port} could not be reached")):
115
- RawPrinter().send(_endpoint(), port, b"job")
113
+ started = time.monotonic()
114
+ with pytest.raises(DeviceUnavailableError, match=re.escape(f"127.0.0.1:{port} refused every connection")):
115
+ RawPrinter().send(_endpoint(), port, b"job")
116
+ elapsed = time.monotonic() - started
117
+
118
+ # The refusal is retried for a bounded window, then given up. Windows takes about 2 s to
119
+ # report each refused attempt (measured: 2.07 s), so the bound allows for one more attempt
120
+ # after the 3 s window.
121
+ assert elapsed < 9.0
122
+
123
+
124
+ def test_a_port_that_keeps_refusing_points_at_a_restart() -> None:
125
+ # A PS301 RAW port can refuse every connect for minutes while the monitor shows the port
126
+ # idle, so status cannot reveal it; the message is the only place the user learns that a
127
+ # restart clears it. The full patient timeout: on Windows a refused connect takes about 2 s
128
+ # to be reported, and a timeout below that turns the refusal into a plain TimeoutError.
129
+ with pytest.raises(DeviceUnavailableError) as caught:
130
+ RawPrinter().send(_endpoint(), closed_port(), b"job")
131
+
132
+ message = str(caught.value)
133
+ assert "refused every connection for 3 s" in message
134
+ assert "status does not show" in message
135
+ assert "reset" in message
136
+
137
+
138
+ def _accept_one_job(listener: socket.socket, received: bytearray) -> None:
139
+ conn, _ = listener.accept()
140
+ with conn:
141
+ while chunk := conn.recv(4096):
142
+ received += chunk
143
+
144
+
145
+ def test_a_port_that_refuses_for_a_moment_after_a_job_still_takes_the_next_one() -> None:
146
+ # A PS301 RAW port refuses a new connect for about 1-2 s after the previous job closed. Here
147
+ # the port refuses (nothing listens) until a listener opens on it 0.8 s later.
148
+ received = bytearray()
149
+ port = closed_port()
150
+
151
+ def listen_late() -> None:
152
+ time.sleep(0.8)
153
+ with socket.create_server(("127.0.0.1", port)) as listener:
154
+ _accept_one_job(listener, received)
155
+
156
+ worker = threading.Thread(target=listen_late, daemon=True)
157
+ worker.start()
158
+ RawPrinter().send(_endpoint(), port, b"second job")
159
+ worker.join(_PATIENT)
160
+
161
+ assert bytes(received) == b"second job"
116
162
 
117
163
 
118
164
  def test_a_malformed_host_name_is_unavailable_not_a_raw_codec_error() -> None:
@@ -3,10 +3,10 @@
3
3
  from __future__ import annotations
4
4
 
5
5
  import re
6
- import socket
7
6
  from typing import TYPE_CHECKING
8
7
 
9
8
  import pytest
9
+ from fake_lpd_server import closed_port
10
10
  from fake_telnet_server import GREETING, IDLE_MONITOR, FakeTelnetServer, TelnetBehaviour
11
11
 
12
12
  from sercomm_printserver.adapters.telnet import TelnetClient
@@ -129,14 +129,16 @@ def test_the_cap_counts_the_greeting_too() -> None:
129
129
 
130
130
 
131
131
  def test_a_refused_connection_is_unavailable_and_names_the_address() -> None:
132
- # A bound socket that never listens refuses connects, and holding it keeps the port ours.
133
- with socket.socket() as closed_port:
134
- closed_port.bind(("127.0.0.1", 0))
135
- port = closed_port.getsockname()[1]
136
- endpoint = DeviceEndpoint(host="127.0.0.1", telnet_port=port, timeout=_PATIENT)
137
-
138
- with pytest.raises(DeviceUnavailableError, match=re.escape(f"127.0.0.1:{port} could not be reached")):
139
- TelnetClient().monitor(endpoint)
132
+ # A port nothing holds is refused on every OS; a bound-but-not-listening one times out on
133
+ # macOS. The cause check keeps a timeout, which also reads "could not be reached", from
134
+ # passing. The patient timeout covers Windows, which reports a refusal after about 2 s.
135
+ port = closed_port()
136
+ endpoint = DeviceEndpoint(host="127.0.0.1", telnet_port=port, timeout=_PATIENT)
137
+
138
+ with pytest.raises(DeviceUnavailableError, match=re.escape(f"127.0.0.1:{port} could not be reached")) as caught:
139
+ TelnetClient().monitor(endpoint)
140
+
141
+ assert isinstance(caught.value.__cause__, ConnectionRefusedError)
140
142
 
141
143
 
142
144
  def test_a_malformed_host_name_is_unavailable_not_a_raw_codec_error() -> None:
@@ -110,7 +110,9 @@ def test_factory_reset_needs_the_default_name_that_belongs_to_the_mac() -> None:
110
110
  device = _device()
111
111
  table = FakeNeighborTable()
112
112
 
113
- with pytest.raises(ConfirmationRequiredError, match="SC123456"):
113
+ with pytest.raises(
114
+ ConfirmationRequiredError, match="factory reset by MAC needs the device's default name SC123456"
115
+ ):
114
116
  factory_reset(table, _opener(device), endpoint=_SESSION, ip=_IP, mac=_MAC, confirm_name="PS_EXAMPLE")
115
117
  assert (device.actions, table.history) == ([], [])
116
118
 
@@ -256,7 +258,7 @@ def test_assign_ip_refuses_firmware_without_a_dhcp_switch_and_writes_nothing() -
256
258
  before = device.config
257
259
  table = FakeNeighborTable()
258
260
 
259
- with pytest.raises(ConfigFormatError, match="DHCP_MODE"):
261
+ with pytest.raises(ConfigFormatError, match="no parameter 'DHCP_MODE' in this configuration"):
260
262
  assign_ip(table, _opener(device), endpoint=_SESSION, ip=_IP, mac=_MAC)
261
263
 
262
264
  assert (device.config, device.actions, table.entries) == (before, [], {})
@@ -179,5 +179,5 @@ def test_the_parsed_set_values_keep_the_tree_and_the_keys() -> None:
179
179
 
180
180
  @pytest.mark.os_agnostic
181
181
  def test_parsing_the_command_line_judges_the_profile_before_the_set_values() -> None:
182
- with pytest.raises(click.UsageError, match=r"\.\./x"):
182
+ with pytest.raises(click.UsageError, match=r"profile contains invalid characters: \.\./x"):
183
183
  parse_command_line("../x", ("noequals",))
@@ -24,7 +24,7 @@ def test_when_profile_is_dot_dot_it_rejects(clear_config_cache: None) -> None:
24
24
  """A bare '..' profile must be rejected."""
25
25
  from sercomm_printserver.adapters.config.loader import get_config
26
26
 
27
- with pytest.raises(ValueError, match="profile"):
27
+ with pytest.raises(ValueError, match="profile cannot start with a dot"):
28
28
  get_config(profile="..")
29
29
 
30
30
 
@@ -259,7 +259,7 @@ def test_raw_data_for_l1_occupies_the_port_l1_is_routed_to(server: PrintServer)
259
259
  def test_an_lpd_job_for_l1_occupies_the_port_l1_is_routed_to(server: PrintServer, device: _TestDevice) -> None:
260
260
  # With no printer ready the device takes the job but holds back its acknowledgement of the
261
261
  # data file (measured), so the submit times out; the port shows the job until the restart in
262
- # the finally clause clears it. Printing it for real needs a printer (OPEN-WORK [15]).
262
+ # the finally clause clears it. Printing it for real is in test_e2e_printer.py.
263
263
  routed_to = find_line(parse_config(server.read_config_text()), "L1_PROUT").value
264
264
  if any(port.state is not PortState.IDLE for port in server.status()):
265
265
  pytest.skip("a port is busy already; this test needs every port idle")
@@ -0,0 +1,159 @@
1
+ """End-to-end print tests: real jobs through the test print server to a real printer.
2
+
3
+ Run with ``SERCOMM_E2E=1 SERCOMM_E2E_PRINTER=1 pytest -m printer tests/test_e2e_printer.py`` once
4
+ ``test-device.json`` names the printer in its ``printer`` section. Each job prints one short
5
+ label whose text says which test sent it and when, so the paper can be matched to the run.
6
+
7
+ What makes these tests different from the RAW and LPD tests in ``test_e2e_device.py``: there,
8
+ no printer takes the data, so a job stays on its port until a restart clears it, and an LPD
9
+ submit times out waiting for the device to acknowledge the data file. Here the printer takes
10
+ the data, so the LPD submit is acknowledged and the port drains back to idle with no restart.
11
+ That difference is what each test asserts. None of them changes the configuration.
12
+
13
+ The device answers one RAW connection at a time and refuses a new one for about 1-2 s after the
14
+ previous close (measured on a PS301, FW 6022); nothing else may use the printer during the run.
15
+ """
16
+
17
+ from __future__ import annotations
18
+
19
+ import json
20
+ import time
21
+ from datetime import datetime, timezone
22
+ from enum import Enum
23
+ from ipaddress import IPv4Address
24
+ from pathlib import Path
25
+ from typing import TYPE_CHECKING
26
+
27
+ import pytest
28
+ from pydantic import BaseModel, ConfigDict, Field
29
+
30
+ from sercomm_printserver.composition import open_print_server
31
+ from sercomm_printserver.domain.config_codec import find_line, parse_config
32
+ from sercomm_printserver.domain.endpoint import DeviceEndpoint, PrintJob
33
+ from sercomm_printserver.domain.port_status import PortState, PrinterStatus
34
+
35
+ if TYPE_CHECKING:
36
+ from sercomm_printserver.application.print_server import PrintServer
37
+
38
+ pytestmark = [pytest.mark.device, pytest.mark.printer]
39
+
40
+ _ROOT = Path(__file__).resolve().parents[1]
41
+ #: How long a job may take to drain to an idle port. A one-line label is under 100 bytes, a
42
+ #: fraction of a second even on a 9600-baud serial port; the margin covers the printer itself.
43
+ _DRAIN_SECONDS = 30.0
44
+ #: Pause between status reads while waiting; each read is an FTP session of its own.
45
+ _POLL_SECONDS = 1.0
46
+
47
+
48
+ class LabelFormat(Enum):
49
+ """How a test label is encoded for the printer."""
50
+
51
+ TEXT = "text"
52
+ DPL = "dpl"
53
+
54
+
55
+ class _Printer(BaseModel):
56
+ model_config = ConfigDict(extra="forbid", frozen=True)
57
+
58
+ logical_printer: int = Field(ge=1, le=3)
59
+ port: str
60
+ label: LabelFormat
61
+
62
+
63
+ class _PrinterDevice(BaseModel):
64
+ model_config = ConfigDict(extra="ignore", frozen=True)
65
+
66
+ host: IPv4Address
67
+ printer: _Printer | None = None
68
+
69
+
70
+ @pytest.fixture(scope="module")
71
+ def printer_device() -> _PrinterDevice:
72
+ device = _PrinterDevice.model_validate(json.loads((_ROOT / "test-device.json").read_text(encoding="utf-8")))
73
+ if device.printer is None:
74
+ pytest.skip("test-device.json has no printer section")
75
+ return device
76
+
77
+
78
+ @pytest.fixture(scope="module")
79
+ def printer(printer_device: _PrinterDevice) -> _Printer:
80
+ assert printer_device.printer is not None
81
+ return printer_device.printer
82
+
83
+
84
+ @pytest.fixture(scope="module")
85
+ def server(printer_device: _PrinterDevice) -> PrintServer:
86
+ return open_print_server(DeviceEndpoint(host=str(printer_device.host), timeout=10.0))
87
+
88
+
89
+ def _label(printer: _Printer, text: str) -> bytes:
90
+ """One printed line saying who sent it and when."""
91
+ line = f"{text} {datetime.now(tz=timezone.utc):%H:%M:%S}Z"
92
+ if printer.label is LabelFormat.DPL:
93
+ # <STX>n inches, <STX>L label format, one text record (font 1, 0.98 in up, 0.39 in in),
94
+ # one copy, end of label.
95
+ return b"\x02n\x02L\r1211000000980039" + line.encode("ascii") + b"\rQ0001\rE\r"
96
+ return line.encode("ascii") + b"\r\n\x0c"
97
+
98
+
99
+ def _port_state(server: PrintServer, port: str) -> PortState:
100
+ return next(status.state for status in server.status() if status.port.value == port)
101
+
102
+
103
+ def _wait_until_idle(server: PrintServer, port: str) -> bool:
104
+ deadline = time.monotonic() + _DRAIN_SECONDS
105
+ while time.monotonic() < deadline:
106
+ if _port_state(server, port) is PortState.IDLE:
107
+ return True
108
+ time.sleep(_POLL_SECONDS)
109
+ return False
110
+
111
+
112
+ def _require_idle_start(server: PrintServer, port: str) -> None:
113
+ if _port_state(server, port) is not PortState.IDLE:
114
+ pytest.skip(f"{port} is busy already; is something else printing?")
115
+
116
+
117
+ def test_the_printer_is_on_line_on_the_port_its_logical_printer_is_routed_to(
118
+ server: PrintServer, printer: _Printer
119
+ ) -> None:
120
+ routed_to = find_line(parse_config(server.read_config_text()), f"L{printer.logical_printer}_PROUT").value
121
+ status = next(status for status in server.status() if status.port.value == printer.port)
122
+
123
+ assert routed_to == printer.port
124
+ assert status.printer_status is PrinterStatus.ON_LINE
125
+
126
+
127
+ def test_two_raw_jobs_back_to_back_reach_the_printer_and_the_port_drains(
128
+ server: PrintServer, printer: _Printer
129
+ ) -> None:
130
+ # The second connect meets the device's 1-2 s refusal after the first job's close; the RAW
131
+ # adapter's retry is what lets it through.
132
+ _require_idle_start(server, printer.port)
133
+ drained = False
134
+ try:
135
+ server.print_raw(printer.logical_printer, _label(printer, "E2E RAW 1/2"))
136
+ server.print_raw(printer.logical_printer, _label(printer, "E2E RAW 2/2"))
137
+ drained = _wait_until_idle(server, printer.port)
138
+ finally:
139
+ if not drained:
140
+ server.reset(wait=True)
141
+
142
+ assert drained, f"{printer.port} still busy {_DRAIN_SECONDS:.0f} s after the jobs"
143
+
144
+
145
+ def test_an_lpd_job_is_acknowledged_and_the_port_drains(server: PrintServer, printer: _Printer) -> None:
146
+ # Without a printer the device holds back its acknowledgement of the data file and the
147
+ # submit times out (test_e2e_device.py); a printer that takes the data lets it complete.
148
+ _require_idle_start(server, printer.port)
149
+ drained = False
150
+ try:
151
+ server.print_lpd(
152
+ f"L{printer.logical_printer}", PrintJob(data=_label(printer, "E2E LPD"), name="sercomm-e2e-lpd")
153
+ )
154
+ drained = _wait_until_idle(server, printer.port)
155
+ finally:
156
+ if not drained:
157
+ server.reset(wait=True)
158
+
159
+ assert drained, f"{printer.port} still busy {_DRAIN_SECONDS:.0f} s after the job"
@@ -25,7 +25,7 @@ from typing import TYPE_CHECKING, Any
25
25
 
26
26
  import pytest
27
27
  import rtoml
28
- from lib_layered_config import Config, deploy_permissions_from_config
28
+ from lib_layered_config import Config, Layer, deploy_permissions_from_config
29
29
 
30
30
  from sercomm_printserver import __init__conf__
31
31
  from sercomm_printserver.adapters import cli as cli_mod
@@ -307,9 +307,9 @@ def test_the_layer_modes_are_755_644_for_app_and_host_and_700_600_for_user(sourc
307
307
 
308
308
  modes = {
309
309
  layer: (settings.for_layer(layer).directory.value, settings.for_layer(layer).file.value)
310
- for layer in ("app", "host", "user")
310
+ for layer in (Layer.APP, Layer.HOST, Layer.USER)
311
311
  }
312
- assert modes == {"app": (0o755, 0o644), "host": (0o755, 0o644), "user": (0o700, 0o600)}
312
+ assert modes == {Layer.APP: (0o755, 0o644), Layer.HOST: (0o755, 0o644), Layer.USER: (0o700, 0o600)}
313
313
  assert settings.enabled is True
314
314
 
315
315
 
@@ -384,7 +384,7 @@ def test_an_empty_confirmation_does_not_match_the_empty_name_of_a_reset_device(
384
384
  ) -> None:
385
385
  device = _factory_reset_device()
386
386
 
387
- with pytest.raises(ConfirmationRequiredError, match="SC123456"):
387
+ with pytest.raises(ConfirmationRequiredError, match=r"needs the device's name as confirmation \( or SC123456\)"):
388
388
  call(_server(device), "")
389
389
  assert action not in device.actions
390
390