DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Clean up test case importing

Browse source 
Move this to a helper function and return a set of test names instead of
a list.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2024-03-17 15:39:54 +02:00
parent 3054112254
commit 91282e29ff
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/hwsim/run-tests.py
View file

@ -228,16 +228,15 @@ def get_test_description(t):
desc += " [long]" desc += " [long]"
return desc return desc
def main(): def import_test_cases():
tests = [] tests = []
test_modules = [] test_modules = []
names = set() names = set()
files = os.listdir(scriptsdir) files = os.listdir(scriptsdir)
for t in files: re_files = (re.match(r'(test_.*)\.py$', n) for n in files)
m = re.match(r'(test_.*)\.py$', t) test_files = (m.group(1) for m in re_files if m)
if m: for t in test_files:
logger.debug("Import test cases from " + t) mod = __import__(t)
mod = __import__(m.group(1))
test_modules.append(mod.__name__.replace('test_', '', 1)) test_modules.append(mod.__name__.replace('test_', '', 1))
for key, val in mod.__dict__.items(): for key, val in mod.__dict__.items():
if key.startswith("test_"): if key.startswith("test_"):
@ -249,7 +248,10 @@ def main():
if name in names: if name in names:
print(f"Test case {name} defined multiple times") print(f"Test case {name} defined multiple times")
names.add(name) names.add(name)
test_names = list(names) return tests, test_modules, names
def main():
tests, test_modules, test_names = import_test_cases()
run = None run = None