Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UCS/CONFIG: Filter out not loaded config tables for unused vars message #8557

Merged
merged 4 commits into from
Oct 30, 2022
Merged

UCS/CONFIG: Filter out not loaded config tables for unused vars message #8557

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27ac58b
UCS/CONFIG: filter out not loaded config tables for unused vars message
shasson5 Oct 25, 2022
81c00ba
UCS/CONFIG: Fixed test to support setups with no IB devices
shasson5 Oct 27, 2022
801c1ef
UCS/CONFIG: CR fixes
shasson5 Oct 28, 2022
0ad5005
UCS/CONFIG: CR fixes
shasson5 Oct 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions test/apps/test_fuzzy_match.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,26 @@ def __init__(self, ucx_info, verbose):
self.ucx_info = ucx_info
if verbose:
logging.basicConfig(level=logging.DEBUG)

def has_ib(self):
status, output = commands.getstatusoutput('ibv_devinfo')
if status != 0:
return False

return 'No IB devices found' not in output

def run(self, test_case, needs_ib=False):
if needs_ib and not self.has_ib():
# Skip test if IB transport is required but not available.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excessive commenting

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you mean it's not needed at all? or it should just be shorter?

return

def run(self, expected):
with Environment(expected.keys()):
with Environment(test_case.keys()):
matches = self.get_fuzzy_matches()

if matches != expected:
raise Exception('Wrong fuzzy list: got: %s, expected: %s' % (matches, expected))
if matches != test_case:
raise Exception('Wrong fuzzy list: got: %s, expected: %s' % (matches, test_case))

logging.info('found all expected matches: %s' % expected)
logging.info('found all expected matches: %s' % test_case)

def exec_ucx_info(self):
cmd = self.ucx_info + ' -u m -w'
Expand Down Expand Up @@ -86,15 +97,19 @@ def get_fuzzy_matches(self):

try:
runner = TestRunner(args.ucx_info, args.verbose)
expected_list = [{'UCX_LOF_LEVEL' : ['UCX_LOG_LEVEL']},
{'UCX_LOF_LEVEL' : ['UCX_LOG_LEVEL'], 'UCX_MOFULE_D' : ['UCX_MODULE_DIR', 'UCX_MODULES']},
{'UCX_SOME_VAR' : [], 'UCX_SOME_VAR2' : [], 'UCX_SOME_VAR3' : [], 'UCX_SOME_VAR4' : []},
{'UCX_SOME_VAR' : [], 'UCX_MOFULE_D' : ['UCX_MODULE_DIR', 'UCX_MODULES'], 'UCX_SOME_VAR2' : [], 'UCX_LOF_LEVEL' : ['UCX_LOG_LEVEL']},
{'UCX_RC_VERBS_RX_MAX_BUF' : ['UCX_RC_VERBS_TX_MAX_BUFS', 'UCX_RC_VERBS_RX_MAX_BUFS', 'UCX_UD_VERBS_RX_MAX_BUFS']},
{'UCX_RLS' : ['UCX_TLS']}]
test_cases = [{'UCX_LOF_LEVEL' : ['UCX_LOG_LEVEL']},
{'UCX_LOF_LEVEL' : ['UCX_LOG_LEVEL'], 'UCX_MOFULE_D' : ['UCX_MODULE_DIR', 'UCX_MODULES']},
{'UCX_SOME_VAR' : [], 'UCX_SOME_VAR2' : [], 'UCX_SOME_VAR3' : [], 'UCX_SOME_VAR4' : []},
{'UCX_SOME_VAR' : [], 'UCX_MOFULE_D' : ['UCX_MODULE_DIR', 'UCX_MODULES'], 'UCX_SOME_VAR2' : [], 'UCX_LOF_LEVEL' : ['UCX_LOG_LEVEL']},
{'UCX_RLS' : ['UCX_TLS']}]

for expected in expected_list:
runner.run(expected)
ib_test_cases = [{'UCX_RC_VERBS_RX_MAX_BUF' : ['UCX_RC_VERBS_TX_MAX_BUFS', 'UCX_RC_VERBS_RX_MAX_BUFS', 'UCX_UD_VERBS_RX_MAX_BUFS']}]

for test_case in test_cases:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe smth like this

if self.has_ib()
    test_cases += ib_test_cases

and remove "needs_ib" param

runner.run(test_case)

for test_case in ib_test_cases:
runner.run(test_case, needs_ib=True)

except Exception as e:
logging.error(str(e))
Expand Down