From eaae700c43cb11955b865b51b2008e1bdafcee8c Mon Sep 17 00:00:00 2001 From: Liis Kivistik Date: Tue, 24 Aug 2021 15:39:34 +0200 Subject: [PATCH] Add missing changes --- .yamato/script/log_scripts/log_parser.py | 9 +++++---- .yamato/script/log_scripts/utils/utr_log.py | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.yamato/script/log_scripts/log_parser.py b/.yamato/script/log_scripts/log_parser.py index 7caedf4944d..95b714c0509 100644 --- a/.yamato/script/log_scripts/log_parser.py +++ b/.yamato/script/log_scripts/log_parser.py @@ -10,6 +10,7 @@ from utils.utr_log import UTR_log from utils.unity_log import Unity_log from utils.shared_utils import * +from utils.constants import * ''' This script runs for extended Yamato reporting. It @@ -73,18 +74,18 @@ def recursively_match_patterns(logs, cmd, patterns, failure_string): test_results_path = test_results_match[1] + test_results_match[2] for redirect in pattern['redirect']: - if redirect == 'utr_log': + if redirect == UTR_LOG: try: df = UTR_log(test_results_path) recursively_match_patterns(logs, cmd, df.get_patterns(), df.read_log()) except Exception as e: - print('! Failed to parse UTR TestResults.json: ', e) - elif redirect == 'unity_log': + print(f'! Failed to parse UTR TestResults.json: ', str(e)) + elif redirect == UNITY_LOG: try: df = Unity_log(test_results_path) recursively_match_patterns(logs, cmd, df.get_patterns(), df.read_log()) except Exception as e: - print('! Failed to parse UnityLog.txt', e) + print(f'! Failed to parse UnityLog.txt', str(e)) else: print('! Invalid redirect: ', redirect) diff --git a/.yamato/script/log_scripts/utils/utr_log.py b/.yamato/script/log_scripts/utils/utr_log.py index e583cc62d00..dc59271d643 100644 --- a/.yamato/script/log_scripts/utils/utr_log.py +++ b/.yamato/script/log_scripts/utils/utr_log.py @@ -1,5 +1,6 @@ import os from .shared_utils import load_json, find_matching_patterns +from .shared_utils import * class UTR_log(): ''''Handles parsing UTR logs (TestResults.json) against known error patterns'''