hansjone/netx
1
0
Fork 0
mirror of https://github.com/hansjone/netx.git synced 2026-10-18 01:40:51 +08:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Cisco IOS collection: disable paging after prompt drain.

Browse source 
Send terminal length 0 ourselves and wait for a full prompt line, so the
echo line cannot end the read and long show output no longer stalls on
--More--.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
oliver 2026-10-16 19:21:42 +08:00
parent 9085cac742
commit a36de061cd
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests/test_ne_session_interactive.py
View file

@ -82,24 +82,29 @@ class CiscoCollectionPrepTests(unittest.TestCase):
return sess
@patch("netx_api.ne_netmiko.drain_read_channel")
def test_setup_only_establishes_hostname_prompt(self, drain: MagicMock):
def test_setup_drains_then_disables_paging_on_full_prompt_line(self, drain: MagicMock):
sess = self.session()
order: list[str] = []
drain.side_effect = lambda *_a, **_k: order.append("drain")
sess.set_base_prompt.side_effect = lambda **kw: order.append("prompt")
sess.write_channel.side_effect = lambda data: order.append(f"write:{data}")
sess.read_until_pattern.side_effect = lambda **kw: order.append("read")
sess.session_preparation()
self.assertEqual(order, ["prompt", "drain"])
self.assertEqual(order, ["prompt", "drain", "write:terminal length 0\r", "read", "drain"])
sess.set_base_prompt.assert_called_once()
initial = sess._test_channel_read.call_args.kwargs["pattern"]
self.assertIsNotNone(re.search(initial, "R2.lab#"))
self.assertIsNone(re.search(initial, "R2.lab#terminal length 0"))
channel = SimpleNamespace(read_timeout_override=None, _read_buffer="", read_channel=lambda: "R2.lab#")
self.assertEqual(BaseConnection.read_until_pattern(channel, pattern=initial), "R2.lab#")
prompt_line = sess.read_until_pattern.call_args.kwargs["pattern"]
self.assertIsNone(re.search(prompt_line, "R2.lab#terminal length 0\r\n"))
self.assertIsNone(re.search(prompt_line, "R2Xlab#"))
self.assertIsNotNone(re.search(prompt_line, "R2.lab#terminal length 0\r\nR2.lab#"))
sess.set_terminal_width.assert_not_called()
sess.disable_paging.assert_not_called()
sess.write_channel.assert_not_called()
sess.send_command_timing.assert_not_called()
drain.assert_called_once()
self.assertEqual(drain.call_count, 2)
self.assertEqual(drain.call_args.kwargs.get("idle_reads"), 8)
@patch("netx_api.ne_netmiko.drain_read_channel")
@ -113,13 +118,13 @@ class CiscoCollectionPrepTests(unittest.TestCase):
sess.send_command_timing.assert_not_called()
@patch("netx_api.ne_netmiko.drain_read_channel")
def test_setup_never_sends_terminal_commands(self, drain: MagicMock):
def test_setup_sends_only_terminal_length_zero(self, drain: MagicMock):
sess = self.session()
sess.session_preparation()
sess.write_channel.assert_not_called()
sess.write_channel.assert_called_once_with("terminal length 0\r")
sess.set_terminal_width.assert_not_called()
sess.disable_paging.assert_not_called()
drain.assert_called_once_with(sess, idle_reads=8, pause_sec=0.1)
drain.assert_called_with(sess, idle_reads=8, pause_sec=0.1)
class ZteCollectionPrepTests(unittest.TestCase):