From f8b26af7415c1c295aa9415861c7402c6da54e25 Mon Sep 17 00:00:00 2001 From: Janusz Dziedzic Date: Sun, 12 Jan 2020 23:02:18 +0100 Subject: [PATCH] tests: remote: Allow hwsim test cases with more than two arguments This allows more test cases to be run in remote setup. Previously, we used to block all test cases that required more than two arguments (i.e., that needed the params argument). Signed-off-by: Janusz Dziedzic --- tests/remote/hwsim_wrapper.py | 6 ++++-- tests/remote/run-tests.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/remote/hwsim_wrapper.py b/tests/remote/hwsim_wrapper.py index 36df8d7a8..38f927f6e 100644 --- a/tests/remote/hwsim_wrapper.py +++ b/tests/remote/hwsim_wrapper.py @@ -67,13 +67,15 @@ def run_hwsim_test(devices, setup_params, refs, duts, monitors, hwsim_test): dut_host.dev['bssid'] = rutils.get_mac_addr(dut_host) apdev.append(dut_host.dev) - # run hwsim test/currently only 2 params tests if hwsim_test.__code__.co_argcount == 1: hwsim_test(dev) elif hwsim_test.__code__.co_argcount == 2: hwsim_test(dev, apdev) else: - raise Exception("more than 2 arguments required") + params = {} + params['long'] = 1 + params['logdir'] = local_log_dir + hwsim_test(dev, apdev, params) # hostapd/wpa_supplicant cleanup for wpas in dev: diff --git a/tests/remote/run-tests.py b/tests/remote/run-tests.py index b68610816..8c5d02b44 100755 --- a/tests/remote/run-tests.py +++ b/tests/remote/run-tests.py @@ -200,7 +200,7 @@ def main(): t = None for tt in hwsim_tests: name = tt.__name__.replace('test_', '', 1) - if name == test and tt.__code__.co_argcount <= 2: + if name == test: t = tt break if not t: