janware/jw-devtest
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-devtest synced 2026-01-15 02:22:56 +01:00
Code Releases Activity

test.expect(): Add support for Cmd class array

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2024-01-18 12:28:11 +01:00
commit 9da6c3f31b
1 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/python/devtest/os/test/test.py
View file

@ -8,6 +8,15 @@ from ..misc import *
from ..Connection import Connection from ..Connection import Connection
from ..Connections import Connections from ..Connections import Connections
class Cmd: # export
def __init__(self, cmdline, expect = None, act_timeout = None, total_timeout = None, flags = 0x0):
self.cmdline = cmdline
self.expect = expect
self.act_timeout = act_timeout
self.total_timeout = total_timeout
self.flags = flags
async def expect(conn, cmd=None, regex=None, subject=None, act_timeout=0.1, total_timeout=None, log_act=None): # export async def expect(conn, cmd=None, regex=None, subject=None, act_timeout=0.1, total_timeout=None, log_act=None): # export
# regex is a keyword-argument so that other arguments to support other # regex is a keyword-argument so that other arguments to support other
# checks can be added later # checks can be added later
@ -69,25 +78,35 @@ async def cmds_exec(console, cmds, log_act=None, echo_cmd=False): # export
return False return False
for c in cmds: for c in cmds:
cmdline = c[0] default_timeout = 2
e = None if len(c) < 2 else c[1] default_flags = 0x0
timeout = 200 if len(c) < 3 else c[2] if isinstance(c, Cmd):
cmdline = c.cmdline
act_timeout = default_timeout if c.act_timeout is None else c.act_timeout
total_timeout = act_timeout if c.total_timeout is None else c.total_timeout
flags = default_flags if c.flags is None else c.flags
else:
cmdline = c[0]
e = None if len(c) < 2 else c[1]
act_timeout = 2 if len(c) < 3 else c[2]
total_timeout = act_timeout if len(c) < 4 else c[3]
flags = default_flags
if cmdline is None: if cmdline is None:
if e is None: if e is None:
continue continue
slog(DEBUG, 'Waiting for: "{}"'.format(e)) slog(DEBUG, 'Waiting for: "{}"'.format(e))
rr = await expect(console, regex=e, act_timeout=timeout) rr = await expect(console, regex=e, act_timeout=act_timeout, total_timeout=total_timeout)
if rr is None: if rr is None:
return 'Timed out waiting for: "{}"'.format(e) return 'Timed out waiting for: "{}"'.format(e)
elif isinstance(cmdline, str): elif isinstance(cmdline, str):
rr = await cmd_exec(console, cmdline, act_timeout=1, log_act=log_act, echo_cmd=echo_cmd) rr = await cmd_exec(console, cmdline, act_timeout=act_timeout, total_timeout=total_timeout, log_act=log_act, echo_cmd=echo_cmd)
if rr is None: if rr is None:
return 'Failed to run command "{}"'.format(cmdline) return 'Failed to run command "{}"'.format(cmdline)
if e is not None: if e is not None:
if find_match(rr, e): if find_match(rr, e):
continue continue
slog(DEBUG, 'Waiting for: "{}"'.format(e)) slog(DEBUG, 'Waiting for: "{}"'.format(e))
rr = await expect(console, regex=e, act_timeout=timeout) rr = await expect(console, regex=e, act_timeout=act_timeout, total_timeout=total_timeout)
if rr is None: if rr is None:
return 'Timed out waiting for: "{}"'.format(e) return 'Timed out waiting for: "{}"'.format(e)
else: else: