test-runner: run iwmon per-subtest
PATCH 1/2 test-runner: run iwmon per-subtest
Previously iwmon was running per-test, which would jumble any subtests together into the same log file making it hard to parse. Now create a separate directory for each subtest and put the monitor log and pcap there.
--- tools/test-runner.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-)
tools/test-runner.c +28 -7
@@ -1847,6 +1847,7 @@ static void run_py_tests(struct l_settings *hw_settings,unsigned int max_exec_interval;char *py_test =NULL ;struct test_stats *test_stats; +pid_t monitor_pid =-1 ; if (!l_settings_get_uint(hw_settings, HW_CONFIG_GROUP_SETUP, HW_CONFIG_SETUP_MAX_EXEC_SEC,
@@ -1865,6 +1866,28 @@ start_next_test:if (!py_test)return ; +if (log) { +char *test_path; +char *ext; +char *full_path; + + test_path =l_strdup_printf ("%s/%s" , test_name, py_test); + ext =strchr (test_path,'.' ); + ext[0 ] ='\0' ; + + full_path =l_strdup_printf ("%s/%s" , log_dir, test_path); + +mkdir (full_path,0755 ); +if (chown (full_path, log_uid, log_gid) <0 ) +l_error ("chown failed %s" , full_path); + +l_free (full_path); + + monitor_pid =start_monitor (test_path); + +l_free (test_path); + } + argv[0 ] ="python3" ; argv[1 ] = py_test; argv[2 ] =NULL ;
@@ -1928,6 +1951,11 @@ start_next_test:l_free (py_test); py_test =NULL ; +if (monitor_pid !=-1 ) { +kill_process (monitor_pid); + monitor_pid =-1 ; + } + goto start_next_test; }
@@ -2040,7 +2068,6 @@ static void create_network_and_run_tests(void *data, void *user_data)pid_t medium_pid =-1 ;pid_t ofono_pid =-1 ;pid_t phonesim_pid =-1 ; -pid_t monitor_pid =-1 ;char *config_dir_path;char *iwd_config_dir;char **tmpfs_extra_stuff =NULL ;
@@ -2186,9 +2213,6 @@ static void create_network_and_run_tests(void *data, void *user_data)l_queue_foreach (wiphy_list, wiphy_up,NULL ); } -if (log) - monitor_pid =start_monitor (test_name); -if (check_verbosity ("tls" ))setenv ("IWD_TLS_DEBUG" ,"on" , true);
@@ -2277,9 +2301,6 @@ static void create_network_and_run_tests(void *data, void *user_data)stop_phonesim (phonesim_pid); } -if (monitor_pid >0 ) -kill_process (monitor_pid); - exit_hostapd:destroy_hostapd_instances (hostapd_pids);
Signature · 1 line
2.21.1
PATCH 2/2 auto-t: change blacklist test RSSI values
These values were meant only to force IWD's BSS preference but since the RSSI's were so low in some cases this caused a roam immediately after connecting. This patch changes the RSSI values to prevent a roam from happening.
--- autotests/testBSSBlacklist/bad_pass_test.py | 4 ++-- autotests/testBSSBlacklist/connection_test.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
autotests/testBSSBlacklist/bad_pass_test.py +2 -2
@@ -36,12 +36,12 @@ class Test(unittest.TestCase): rule1 = hwsim.rules.create() rule1.source = bss_radio[1].addresses[0] rule1.bidirectional = True - rule1.signal = -8000 + rule1.signal = -3000 rule2 = hwsim.rules.create() rule2.source = bss_radio[2].addresses[0] rule2.bidirectional = True - rule2.signal = -10000 + rule2.signal = -4000 wd = IWD(True, '/tmp')
autotests/testBSSBlacklist/connection_test.py +2 -2
@@ -36,12 +36,12 @@ class Test(unittest.TestCase): rule1 = hwsim.rules.create() rule1.source = bss_radio[1].addresses[0] rule1.bidirectional = True - rule1.signal = -8000 + rule1.signal = -3000 rule2 = hwsim.rules.create() rule2.source = bss_radio[2].addresses[0] rule2.bidirectional = True - rule2.signal = -10000 + rule2.signal = -4000 wd = IWD(True, '/tmp')
Signature · 1 line
2.21.1
Hi James,
Quoted 8 lines · James Prestwood
Previously iwmon was running per-test, which would jumble any subtests together into the same log file making it hard to parse. Now create a separate directory for each subtest and put the monitor log and pcap there.
--- tools/test-runner.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-)
Both applied, thanks.
Regards,
-Denis