x/tobiko
Code Issues Proposed changes

Fix reason for skip_unless_missing_networking_agents decorator

Browse Source 
Change-Id: I4ca0bcdf249b747c01c24ae16b6cae142d8216f0
This commit is contained in:
Federico Ressi 2021-09-09 15:01:41 +02:00
parent 81618412de
commit 650b8564c2
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tobiko/common/_skip.py
View File

@ -70,6 +70,7 @@ def skip_unless(reason: str,
"""Mark test case for being skipped for a given reason unless it matches"""
predicate = _get_skip_predicate(predicate, *args, **kwargs)
return _skip_decorator(reason=reason,
unless=True,
bugzilla=bugzilla,
predicate=predicate)

10
tobiko/openstack/neutron/_agent.py
View File

@ -98,8 +98,8 @@ def missing_networking_agents(count=1, **params) -> int:
return max(0, count - actual_count)
def has_networking_agents(**params) -> bool:
return count_networking_agents(**params) > 0
def has_networking_agents(count=1, **params) -> bool:
return count_networking_agents(**params) >= count
def has_ovn() -> bool:
@ -134,17 +134,15 @@ def skip_if_missing_networking_agents(
def skip_unless_missing_networking_agents(
binary: AgentBinaryType = None,
count: int = 1,
**params) \
-> DecoratorType:
if binary is not None:
params['binary'] = binary
message = "found {return_value!r} agent(s)"
message = "has {return_value!r} agent(s)"
if params:
message += " with {!s}".format(
', '.join("{!s}={!r}".format(k, v) for k, v in params.items()))
return tobiko.skip_unless(message, missing_networking_agents, count=count,
**params)
return tobiko.skip_if(message, count_networking_agents, **params)
def skip_if_is_old_ovn():