proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 09:22:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: update munet 0.14.12

Browse Source 
- Adds retry_sleep (i.e., interval) parameter to native @retry decorator
- Fix --stdout and --stderr munet CLI args

Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2024-09-13 18:12:36 -04:00
parent f3fc33e17b
commit bac68aba6c
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/topotests/munet/native.py
View File

@ -2733,7 +2733,7 @@ ff02::2\tip6-allrouters
), ),
"format": "stdout HOST [HOST ...]", "format": "stdout HOST [HOST ...]",
"help": "tail -f on the stdout of the qemu/cmd for this node", "help": "tail -f on the stdout of the qemu/cmd for this node",
"new-window": True, "new-window": {"background": True, "ns_only": True},
}, },
{ {
"name": "stderr", "name": "stderr",
@ -2743,7 +2743,7 @@ ff02::2\tip6-allrouters
), ),
"format": "stderr HOST [HOST ...]", "format": "stderr HOST [HOST ...]",
"help": "tail -f on the stdout of the qemu/cmd for this node", "help": "tail -f on the stdout of the qemu/cmd for this node",
"new-window": True, "new-window": {"background": True, "ns_only": True},
}, },
] ]
} }

24
tests/topotests/munet/testing/util.py
View File

@ -52,12 +52,13 @@ def pause_test(desc=""):
asyncio.run(async_pause_test(desc)) asyncio.run(async_pause_test(desc))
def retry(retry_timeout, initial_wait=0, expected=True): def retry(retry_timeout, initial_wait=0, retry_sleep=2, expected=True):
"""decorator: retry while functions return is not None or raises an exception. """decorator: retry while functions return is not None or raises an exception.
* `retry_timeout`: Retry for at least this many seconds; after waiting * `retry_timeout`: Retry for at least this many seconds; after waiting
initial_wait seconds initial_wait seconds
* `initial_wait`: Sleeps for this many seconds before first executing function * `initial_wait`: Sleeps for this many seconds before first executing function
* `retry_sleep`: The time to sleep between retries.
* `expected`: if False then the return logic is inverted, except for exceptions, * `expected`: if False then the return logic is inverted, except for exceptions,
(i.e., a non None ends the retry loop, and returns that value) (i.e., a non None ends the retry loop, and returns that value)
""" """
@ -65,9 +66,8 @@ def retry(retry_timeout, initial_wait=0, expected=True):
def _retry(func): def _retry(func):
@functools.wraps(func) @functools.wraps(func)
def func_retry(*args, **kwargs): def func_retry(*args, **kwargs):
retry_sleep = 2
# Allow the wrapped function's args to override the fixtures # Allow the wrapped function's args to override the fixtures
_retry_sleep = float(kwargs.pop("retry_sleep", retry_sleep))
_retry_timeout = kwargs.pop("retry_timeout", retry_timeout) _retry_timeout = kwargs.pop("retry_timeout", retry_timeout)
_expected = kwargs.pop("expected", expected) _expected = kwargs.pop("expected", expected)
_initial_wait = kwargs.pop("initial_wait", initial_wait) _initial_wait = kwargs.pop("initial_wait", initial_wait)
@ -82,13 +82,21 @@ def retry(retry_timeout, initial_wait=0, expected=True):
while True: while True:
seconds_left = (retry_until - datetime.datetime.now()).total_seconds() seconds_left = (retry_until - datetime.datetime.now()).total_seconds()
try: try:
try:
ret = func(*args, seconds_left=seconds_left, **kwargs)
except TypeError as error:
if "seconds_left" not in str(error):
raise
ret = func(*args, **kwargs) ret = func(*args, **kwargs)
if _expected and ret is None:
logging.debug("Function returned %s", ret)
positive_result = ret is None
if _expected == positive_result:
logging.debug("Function succeeds") logging.debug("Function succeeds")
return ret return ret
logging.debug("Function returned %s", ret)
except Exception as error: except Exception as error:
logging.info("Function raised exception: %s", str(error)) logging.info('Function raised exception: "%s"', error)
ret = error ret = error
if seconds_left < 0: if seconds_left < 0:
@ -99,10 +107,10 @@ def retry(retry_timeout, initial_wait=0, expected=True):
logging.info( logging.info(
"Sleeping %ds until next retry with %.1f retry time left", "Sleeping %ds until next retry with %.1f retry time left",
retry_sleep, _retry_sleep,
seconds_left, seconds_left,
) )
time.sleep(retry_sleep) time.sleep(_retry_sleep)
func_retry._original = func # pylint: disable=W0212 func_retry._original = func # pylint: disable=W0212
return func_retry return func_retry