From 052319d2ce5517c9eb4560b53b1c9033ab6533e7 Mon Sep 17 00:00:00 2001 From: Matthew Stidham Date: Wed, 17 Mar 2021 15:19:34 -0700 Subject: [PATCH] Remove exit_on_error Signed-off-by: Matthew Stidham --- py-json/test_group_profile.py | 2 +- py-scripts/create_l4.py | 1 - py-scripts/create_qvlan.py | 1 - py-scripts/create_station.py | 1 - py-scripts/example_security_connection.py | 2 +- py-scripts/regression_test.sh | 8 ++++---- py-scripts/sta_connect2.py | 2 +- py-scripts/test_fileio.py | 2 +- py-scripts/test_generic.py | 2 +- py-scripts/test_ipv4_connection.py | 1 - py-scripts/test_ipv4_l4.py | 2 +- py-scripts/test_ipv4_l4_ftp_upload.py | 3 +-- py-scripts/test_ipv4_l4_urls_per_ten.py | 2 +- py-scripts/test_ipv4_l4_wifi.py | 2 +- py-scripts/test_ipv6_connection.py | 2 +- py-scripts/test_ipv6_variable_time.py | 3 --- py-scripts/test_l3_longevity.py | 2 -- py-scripts/test_l3_powersave_traffic.py | 6 +++--- 18 files changed, 17 insertions(+), 27 deletions(-) diff --git a/py-json/test_group_profile.py b/py-json/test_group_profile.py index b5c9bd05..fe08363d 100644 --- a/py-json/test_group_profile.py +++ b/py-json/test_group_profile.py @@ -7,7 +7,7 @@ import time class TestGroupProfile(LFCliBase): def __init__(self, lfclient_host, lfclient_port, local_realm, test_group_name=None, debug_=False): - super().__init__(lfclient_host, lfclient_port, debug_, _halt_on_error=True) + super().__init__(lfclient_host, lfclient_port, debug_) self.local_realm = local_realm self.group_name = test_group_name self.cx_list = [] diff --git a/py-scripts/create_l4.py b/py-scripts/create_l4.py index 309873e0..ccb758e6 100755 --- a/py-scripts/create_l4.py +++ b/py-scripts/create_l4.py @@ -32,7 +32,6 @@ class CreateL4(Realm): side_b_min_rate=56, side_b_max_rate=0, number_template="00000", use_ht160=False, _debug_on=False, - _exit_on_error=False, _exit_on_fail=False): super().__init__(host, port) self.upstream = upstream diff --git a/py-scripts/create_qvlan.py b/py-scripts/create_qvlan.py index 0ea89d08..99f1d590 100755 --- a/py-scripts/create_qvlan.py +++ b/py-scripts/create_qvlan.py @@ -31,7 +31,6 @@ class CreateQVlan(Realm): gateway=None, port_list=[], ip_list=[], - exit_on_error=False, debug=False): super().__init__(host, port) self.host = host diff --git a/py-scripts/create_station.py b/py-scripts/create_station.py index 34ee0b14..51f9f71e 100755 --- a/py-scripts/create_station.py +++ b/py-scripts/create_station.py @@ -34,7 +34,6 @@ class CreateStation(Realm): _proxy_str=None, _debug_on=False, _up=True, - _exit_on_error=False, _exit_on_fail=False): super().__init__(_host, _port) diff --git a/py-scripts/example_security_connection.py b/py-scripts/example_security_connection.py index 6c30c600..80802dfd 100755 --- a/py-scripts/example_security_connection.py +++ b/py-scripts/example_security_connection.py @@ -21,7 +21,7 @@ class IPv4Test(LFCliBase): def __init__(self, ssid, security, password, sta_list=None, ap=None, mode = 0, number_template="00000", host="localhost", port=8080,radio = "wiphy0",_debug_on=False, _exit_on_error=False, _exit_on_fail=False): - super().__init__(host, port, _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) + super().__init__(host, port, _debug=_debug_on, _exit_on_fail=_exit_on_fail) self.host = host self.port = port self.ssid = ssid diff --git a/py-scripts/regression_test.sh b/py-scripts/regression_test.sh index 8d202b78..267216f6 100755 --- a/py-scripts/regression_test.sh +++ b/py-scripts/regression_test.sh @@ -33,7 +33,7 @@ else # these are jedway lab defaults fi NUM_STA=${NUM_STA:-4} TEST_HTTP_IP=${TEST_HTTP_IP:-10.40.0.1} -mgrlen="$(${#MGR})" +MGRLEN="$(${#MGR})" RADIO_USED="wiphy0" COL_NAMES="name,tx_bytes,rx_bytes,dropped" @@ -54,9 +54,9 @@ if [ ! -d "${REPORT_DATA}" ]; then fi TEST_DIR="${REPORT_DATA}/${NOW}" #set -vex - +echo $MGRLEN #Test array -if [[ $mgrlen -gt 0 ]]; then +if [[ $MGRLEN -gt 0 ]]; then function run_l3_longevity { ./test_l3_longevity.py --test_duration 15s --upstream_port eth1 --radio "radio==wiphy0 stations==4 ssid==$SSID_USED ssid_pw==$PASSWD_USED security==$SECURITY" --radio "radio==wiphy1 stations==4 ssid==$SSID_USED ssid_pw==$PASSWD_USED security==$SECURITY" --mgr "$MGR" } @@ -215,7 +215,7 @@ function echo_print() { function run_test() { for i in "${testCommands[@]}"; do - if [[ $mgrlen -gt 0 ]]; then + if [[ $MGRLEN -gt 0 ]]; then ./scenario.py --load FACTORY_DFLT --mgr "${MGR}" else ./scenario.py --load FACTORY_DFLT diff --git a/py-scripts/sta_connect2.py b/py-scripts/sta_connect2.py index 5de7d7aa..ab7f500e 100755 --- a/py-scripts/sta_connect2.py +++ b/py-scripts/sta_connect2.py @@ -41,7 +41,7 @@ class StaConnect2(LFCliBase): # do not use `super(LFCLiBase,self).__init__(self, host, port, _debugOn) # that is py2 era syntax and will force self into the host variable, making you # very confused. - super().__init__(host, port, _debug=debug_, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) + super().__init__(host, port, _debug=debug_, _exit_on_fail=_exit_on_fail) self.debug = debug_ self.dut_security = _dut_security self.dut_ssid = _dut_ssid diff --git a/py-scripts/test_fileio.py b/py-scripts/test_fileio.py index 0ee3ccc0..bd0dc1e0 100755 --- a/py-scripts/test_fileio.py +++ b/py-scripts/test_fileio.py @@ -72,7 +72,7 @@ class FileIOTest(LFCliBase): _debug_on=False, _exit_on_error=False, _exit_on_fail=False): - super().__init__(host, port, _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) + super().__init__(host, port, _debug=_debug_on, _exit_on_fail=_exit_on_fail) self.host = host self.port = port self.radio = radio diff --git a/py-scripts/test_generic.py b/py-scripts/test_generic.py index daea92c3..4ad6ce62 100755 --- a/py-scripts/test_generic.py +++ b/py-scripts/test_generic.py @@ -40,7 +40,7 @@ class GenTest(LFCliBase): _debug_on=False, _exit_on_error=False, _exit_on_fail=False): - super().__init__(host, port, _local_realm=realm.Realm(host,port), _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) + super().__init__(host, port, _local_realm=realm.Realm(host,port), _debug=_debug_on, _exit_on_fail=_exit_on_fail) self.ssid = ssid self.radio = radio self.upstream = upstream diff --git a/py-scripts/test_ipv4_connection.py b/py-scripts/test_ipv4_connection.py index b3344f5f..242e9f48 100755 --- a/py-scripts/test_ipv4_connection.py +++ b/py-scripts/test_ipv4_connection.py @@ -48,7 +48,6 @@ class IPv4Test(LFCliBase): _proxy_str=_proxy_str, _local_realm=realm.Realm(lfclient_host=_host, lfclient_port=_port, - halt_on_error_=_exit_on_error, _exit_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail, _proxy_str=_proxy_str, diff --git a/py-scripts/test_ipv4_l4.py b/py-scripts/test_ipv4_l4.py index 236dde4b..5c7d8c7f 100755 --- a/py-scripts/test_ipv4_l4.py +++ b/py-scripts/test_ipv4_l4.py @@ -36,7 +36,7 @@ class IPV4L4(LFCliBase): _debug_on=False, _exit_on_error=False, _exit_on_fail=False): - super().__init__(host, port, _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) + super().__init__(host, port, _debug=_debug_on, _exit_on_fail=_exit_on_fail) self.host = host self.port = port self.radio = radio diff --git a/py-scripts/test_ipv4_l4_ftp_upload.py b/py-scripts/test_ipv4_l4_ftp_upload.py index 9b326568..3df18d1c 100755 --- a/py-scripts/test_ipv4_l4_ftp_upload.py +++ b/py-scripts/test_ipv4_l4_ftp_upload.py @@ -32,9 +32,8 @@ class IPV4L4(LFCliBase): upstream_port="eth1", radio="wiphy0", test_duration="5m", _debug_on=False, - _exit_on_error=False, _exit_on_fail=False): - super().__init__(host, port, _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) + super().__init__(host, port, _debug=_debug_on, _exit_on_fail=_exit_on_fail) self.host = host self.port = port self.ssid = ssid diff --git a/py-scripts/test_ipv4_l4_urls_per_ten.py b/py-scripts/test_ipv4_l4_urls_per_ten.py index a92859de..ea595470 100755 --- a/py-scripts/test_ipv4_l4_urls_per_ten.py +++ b/py-scripts/test_ipv4_l4_urls_per_ten.py @@ -48,7 +48,7 @@ class IPV4L4(LFCliBase): upstream_port="eth1", _exit_on_error=False, _exit_on_fail=False): - super().__init__(host, port, _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) + super().__init__(host, port, _debug=_debug_on, _exit_on_fail=_exit_on_fail) self.host = host self.port = port diff --git a/py-scripts/test_ipv4_l4_wifi.py b/py-scripts/test_ipv4_l4_wifi.py index 9e064e61..099ae811 100755 --- a/py-scripts/test_ipv4_l4_wifi.py +++ b/py-scripts/test_ipv4_l4_wifi.py @@ -35,7 +35,7 @@ class IPV4L4(LFCliBase): _debug_on=False, _exit_on_error=False, _exit_on_fail=False): - super().__init__(host, port, _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) + super().__init__(host, port, _debug=_debug_on, _exit_on_fail=_exit_on_fail) self.host = host self.port = port self.radio = radio diff --git a/py-scripts/test_ipv6_connection.py b/py-scripts/test_ipv6_connection.py index 6a3ad661..81facd8a 100755 --- a/py-scripts/test_ipv6_connection.py +++ b/py-scripts/test_ipv6_connection.py @@ -34,7 +34,7 @@ class IPv6Test(LFCliBase): _exit_on_error=False, _exit_on_fail=False, number_template="00"): - super().__init__(host, port, _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) + super().__init__(host, port, _debug=_debug_on, _exit_on_fail=_exit_on_fail) self.host = host self.port = port self.ssid = ssid diff --git a/py-scripts/test_ipv6_variable_time.py b/py-scripts/test_ipv6_variable_time.py index 8b7a9e16..1c29cd45 100755 --- a/py-scripts/test_ipv6_variable_time.py +++ b/py-scripts/test_ipv6_variable_time.py @@ -49,17 +49,14 @@ class IPV6VariableTime(LFCliBase): _use_ht160=False, _cx_type=None, _debug_on=False, - _exit_on_error=False, _exit_on_fail=False): super().__init__(_host, _port, _local_realm=realm.Realm(lfclient_host=_host, lfclient_port=_port, debug_=_debug_on, - _exit_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail), _debug=_debug_on, - _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) self.upstream = _upstream self.ssid = _ssid diff --git a/py-scripts/test_l3_longevity.py b/py-scripts/test_l3_longevity.py index b9f75dc0..92040e8b 100755 --- a/py-scripts/test_l3_longevity.py +++ b/py-scripts/test_l3_longevity.py @@ -50,7 +50,6 @@ class L3VariableTime(Realm): lfclient_port=8080, debug=False, _halt_on_error=False, - _exit_on_error=False, _exit_on_fail=False, _proxy_str=None, _capture_signal_list=[]): @@ -58,7 +57,6 @@ class L3VariableTime(Realm): lfclient_port=lfclient_port, debug_=debug, halt_on_error_=_halt_on_error, - _exit_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail, _proxy_str=_proxy_str, _capture_signal_list=_capture_signal_list) diff --git a/py-scripts/test_l3_powersave_traffic.py b/py-scripts/test_l3_powersave_traffic.py index 7e08f569..0ddd9956 100755 --- a/py-scripts/test_l3_powersave_traffic.py +++ b/py-scripts/test_l3_powersave_traffic.py @@ -26,8 +26,8 @@ class L3PowersaveTraffic(LFCliBase): def __init__(self, host, port, ssid, security, password, station_list, side_a_min_rate=56, side_b_min_rate=56, side_a_max_rate=0, side_b_max_rate=0, pdu_size=1000, prefix="00000", test_duration="5m", - _debug_on=False, _exit_on_error=False, _exit_on_fail=False): - super().__init__(host, port, _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) + _debug_on=False, _exit_on_fail=False): + super().__init__(host, port, _debug=_debug_on, _exit_on_fail=_exit_on_fail) self.host = host self.port = port self.ssid = ssid @@ -162,7 +162,7 @@ def main(): password="[BLANK]", station_list=station_list, side_a_min_rate=2000, side_b_min_rate=2000, side_a_max_rate=0, side_b_max_rate=0, prefix="00000", test_duration="30s", - _debug_on=False, _exit_on_error=True, _exit_on_fail=True) + _debug_on=False, _exit_on_fail=True) ip_powersave_test.cleanup() ip_powersave_test.build() ip_powersave_test.start()