diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 3aab41e5..5bda08d5 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -957,58 +957,59 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url) # If collect meta data is set meta_data_path = "" - if self.test_result != "TIMEOUT": - stdout_log_size = os.path.getsize(stdout_log_txt) - if stdout_log_size > 0: - stdout_log_fd = open(stdout_log_txt) - #"Report Location:::/home/lanforge/html-reports/wifi-capacity-2021-08-17-04-02-56" - # - for line in stdout_log_fd: - if "Report Location" in line: - meta_data_path = line.replace('"','') - meta_data_path = meta_data_path.replace('Report Location:::','') - meta_data_path = meta_data_path.split('/')[-1] - meta_data_path = meta_data_path.strip() - meta_data_path = self.report_path + '/' + meta_data_path + '/meta.txt' - break - stdout_log_fd.close() - if meta_data_path != "": - meta_data_fd = open(meta_data_path,'w+') - meta_data_fd.write('$ Generated by Candela Technologies LANforge network testing tool\n') - meta_data_fd.write('$ meta.txt file location\n') - meta_data_fd.write("file {path}\n".format(path=meta_data_path)) - meta_data_fd.write('$ LANforge SERVER\n') - meta_data_fd.write('server_version: {server_version} \n'.format(server_version=self.lanforge_server_version)) - meta_data_fd.write('$ LANforge command\n') - meta_data_fd.write("command {command}\n".format(command=command)) - # split command at test-tag , at rest of string once at the actual test-tag value - test_tag = command.split('test_tag',maxsplit=1)[-1].split(maxsplit=1)[0] - test_tag = test_tag.replace("'","") - meta_data_fd.write('$ LANforge test_tag\n') - meta_data_fd.write("test_tag {test_tag}\n".format(test_tag=test_tag)) - # LANforge information is a list thus [0] - meta_data_fd.write('$ LANforge Information\n') - meta_data_fd.write("lanforge_system_node {lanforge_system_node}\n".format(lanforge_system_node=self.lanforge_system_node_version[0])) - meta_data_fd.write("lanforge_kernel_version {lanforge_kernel_version}\n".format(lanforge_kernel_version=self.lanforge_kernel_version[0])) - meta_data_fd.write("lanforge_server_version_full {lanforge_server_version_full}\n".format(lanforge_server_version_full=self.lanforge_server_version_full[0])) - meta_data_fd.close() + # Will gather data even on a TIMEOUT condition as there is some results on longer tests + stdout_log_size = os.path.getsize(stdout_log_txt) + if stdout_log_size > 0: + stdout_log_fd = open(stdout_log_txt) + #"Report Location:::/home/lanforge/html-reports/wifi-capacity-2021-08-17-04-02-56" + # + for line in stdout_log_fd: + if "Report Location" in line: + meta_data_path = line.replace('"','') + meta_data_path = meta_data_path.replace('Report Location:::','') + meta_data_path = meta_data_path.split('/')[-1] + meta_data_path = meta_data_path.strip() + meta_data_path = self.report_path + '/' + meta_data_path + '/meta.txt' + break + stdout_log_fd.close() + if meta_data_path != "": + meta_data_fd = open(meta_data_path,'w+') + meta_data_fd.write('$ Generated by Candela Technologies LANforge network testing tool\n') + meta_data_fd.write('$ meta.txt file location\n') + meta_data_fd.write("file {path}\n".format(path=meta_data_path)) + meta_data_fd.write('$ LANforge SERVER\n') + meta_data_fd.write('server_version: {server_version} \n'.format(server_version=self.lanforge_server_version)) + meta_data_fd.write('$ LANforge command\n') + meta_data_fd.write("command {command}\n".format(command=command)) + # split command at test-tag , at rest of string once at the actual test-tag value + test_tag = command.split('test_tag',maxsplit=1)[-1].split(maxsplit=1)[0] + test_tag = test_tag.replace("'","") + meta_data_fd.write('$ LANforge test_tag\n') + meta_data_fd.write("test_tag {test_tag}\n".format(test_tag=test_tag)) + # LANforge information is a list thus [0] + meta_data_fd.write('$ LANforge Information\n') + meta_data_fd.write("lanforge_system_node {lanforge_system_node}\n".format(lanforge_system_node=self.lanforge_system_node_version[0])) + meta_data_fd.write("lanforge_kernel_version {lanforge_kernel_version}\n".format(lanforge_kernel_version=self.lanforge_kernel_version[0])) + meta_data_fd.write("lanforge_server_version_full {lanforge_server_version_full}\n".format(lanforge_server_version_full=self.lanforge_server_version_full[0])) + meta_data_fd.close() - if self.test_result != "TIMEOUT": - stderr_log_size = os.path.getsize(stderr_log_txt) - if stderr_log_size > 0: - self.logger.info("File: {} is not empty: {}".format(stderr_log_txt, str(stderr_log_size))) - text = open(stderr_log_txt).read() - if 'Error' in text: - self.text_result = "Failure" - background = self.background_red - else: - self.test_result = "Success" - background = self.background_green + stderr_log_size = os.path.getsize(stderr_log_txt) + if stderr_log_size > 0: + self.logger.info("File: {} is not empty: {}".format(stderr_log_txt, str(stderr_log_size))) + text = open(stderr_log_txt).read() + if 'Error' in text: + self.text_result = "Failure" + background = self.background_red else: - self.logger.info("File: {} is empty: {}".format(stderr_log_txt, str(stderr_log_size))) self.test_result = "Success" background = self.background_green else: + self.logger.info("File: {} is empty: {}".format(stderr_log_txt, str(stderr_log_size))) + self.test_result = "Success" + background = self.background_green + + # if there was a + if self.test_result == "TIMEOUT": self.logger.info("TIMEOUT FAILURE, Check LANforge Radios") self.test_result = "Time Out" background = self.background_purple