From 09a77a968f6c89adeec5493f5b450cae40c50753 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Sat, 21 Aug 2021 18:31:41 -0600 Subject: [PATCH] lf_check.py : stop running tests if lanforge kernel version and GUI version not readable. Signed-off-by: Chuck SmileyRekiere --- py-scripts/tools/lf_check.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 84f3c5c8..3b8d0329 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -1281,10 +1281,6 @@ Example : else: print('%s IP address %s accessible' % (key, value[1])) - if ping_result['LANforge Manager'][1] is None: - pass - else: - check.run_script_test() # get sha and lanforge information for results # Need to do this after reading the configuration @@ -1304,13 +1300,15 @@ Example : lanforge_kernel_version = check.get_lanforge_kernel_version() print("lanforge_kernel_version {kernel_ver}".format(kernel_ver=lanforge_kernel_version)) except: - print("lanforge_kernel_version exception") + print("lanforge_kernel_version exception, tests aborted check lanforge ip") + exit(1) try: lanforge_gui_version_full = check.get_lanforge_gui_version() print("lanforge_gui_version_full {lanforge_gui_version_full}".format(lanforge_gui_version_full=lanforge_gui_version_full)) except: - print("lanforge_gui_version exception") + print("lanforge_gui_version exception, tests aborted check lanforge ip") + exit(1) #check.get_radio_status() @@ -1321,6 +1319,9 @@ Example : lf_test_setup['GUI version'] = lanforge_gui_version_full lf_test_setup['scripts git sha'] = scripts_git_sha + # Successfully gathered LANforge information Run Tests + check.run_script_test() + # generate output reports report.set_title("LF Check: lf_check.py") report.build_banner_left()