scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-04 04:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

lf_check.py : added ability to set timeout on individual tests

Browse Source 
Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-07-15 15:48:24 -06:00
parent 50c367912e
commit 3efcac76fb
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
py-scripts/tools/lf_check.py
View File

@@ -121,6 +121,7 @@ class lf_check():
self.csv_results_column_headers = "" self.csv_results_column_headers = ""
self.logger = logging.getLogger(__name__) self.logger = logging.getLogger(__name__)
self.test_timeout = 120 self.test_timeout = 120
self.test_timeout_default = 120
self.use_blank_db = "FALSE" self.use_blank_db = "FALSE"
self.use_factory_default_db = "FALSE" self.use_factory_default_db = "FALSE"
self.use_custom_db = "FALSE" self.use_custom_db = "FALSE"
@@ -386,6 +387,7 @@ blog: http://{blog}:2368
def read_test_parameters(self): def read_test_parameters(self):
if "test_timeout" in self.json_data["test_parameters"]: if "test_timeout" in self.json_data["test_parameters"]:
self.test_timeout = self.json_data["test_parameters"]["test_timeout"] self.test_timeout = self.json_data["test_parameters"]["test_timeout"]
self.test_timeout_default = self.test_timeout
else: else:
self.logger.info("test_timeout not in test_parameters json") self.logger.info("test_timeout not in test_parameters json")
exit(1) exit(1)
@@ -725,7 +727,7 @@ blog: http://{blog}:2368
self.logger.info("test: {} skipped".format(test)) self.logger.info("test: {} skipped".format(test))
# load the default database # load the default database
elif self.test_dict[test]['enabled'] == "TRUE": elif self.test_dict[test]['enabled'] == "TRUE":
# if args key has a value of an empty scring then need to manipulate the args_list to args # if args key has a value of an empty string then need to manipulate the args_list to args
# list does not have replace only stings do to args_list will be joined and converted to a string and placed # list does not have replace only stings do to args_list will be joined and converted to a string and placed
# in args. Then the replace below will work. # in args. Then the replace below will work.
if self.test_dict[test]['args'] == "": if self.test_dict[test]['args'] == "":
@@ -819,6 +821,12 @@ blog: http://{blog}:2368
if 'BLOG_FLAG' in self.test_dict[test]['args']: if 'BLOG_FLAG' in self.test_dict[test]['args']:
self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('BLOG_FLAG',self.blog_flag) self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('BLOG_FLAG',self.blog_flag)
if 'timeout' in self.test_dict[test]:
self.logger.info("timeout : {}".format(self.test_dict[test]['timeout']))
self.test_timeout = int(self.test_dict[test]['timeout'])
else:
self.test_timeout = self.test_timeout_default
if 'load_db' in self.test_dict[test]: if 'load_db' in self.test_dict[test]:
self.logger.info("load_db : {}".format(self.test_dict[test]['load_db'])) self.logger.info("load_db : {}".format(self.test_dict[test]['load_db']))
if str(self.test_dict[test]['load_db']).lower() != "none" and str(self.test_dict[test]['load_db']).lower() != "skip": if str(self.test_dict[test]['load_db']).lower() != "none" and str(self.test_dict[test]['load_db']).lower() != "skip":