[CONFORMANCE] Fix if impossible to remove log (#16485)
* fix_reporting * w/a for remove * Update merge_xmls.py remove extra
This commit is contained in:
parent
8eb142ca6e
commit
6ac5e42b62
@ -70,7 +70,7 @@ def aggregate_test_results(aggregated_results: SubElement, xml_reports: list, re
|
|||||||
aggregated_device_results = aggregated_results.find(xml_device_entry.tag)
|
aggregated_device_results = aggregated_results.find(xml_device_entry.tag)
|
||||||
if aggregated_device_results is None:
|
if aggregated_device_results is None:
|
||||||
aggregated_results.append(xml_device_entry)
|
aggregated_results.append(xml_device_entry)
|
||||||
continue
|
aggregated_device_results = aggregated_results.find(xml_device_entry.tag)
|
||||||
# op or api_type
|
# op or api_type
|
||||||
for xml_results_entry in xml_device_entry:
|
for xml_results_entry in xml_device_entry:
|
||||||
aggregated_results_entry = aggregated_device_results.find(xml_results_entry.tag)
|
aggregated_results_entry = aggregated_device_results.find(xml_results_entry.tag)
|
||||||
@ -88,7 +88,6 @@ def aggregate_test_results(aggregated_results: SubElement, xml_reports: list, re
|
|||||||
aggregated_results_entry.append(xml_real_device_entry)
|
aggregated_results_entry.append(xml_real_device_entry)
|
||||||
continue
|
continue
|
||||||
update_result_node(xml_real_device_entry, aggregated_real_device_api_report)
|
update_result_node(xml_real_device_entry, aggregated_real_device_api_report)
|
||||||
a = 1
|
|
||||||
return aggregated_timestamp
|
return aggregated_timestamp
|
||||||
|
|
||||||
|
|
||||||
|
@ -199,7 +199,10 @@ class TestParallelRunner:
|
|||||||
def __get_test_list_by_runtime(self):
|
def __get_test_list_by_runtime(self):
|
||||||
test_list_file_name = os.path.join(self._working_dir, "test_list.lst")
|
test_list_file_name = os.path.join(self._working_dir, "test_list.lst")
|
||||||
if os.path.isfile(test_list_file_name):
|
if os.path.isfile(test_list_file_name):
|
||||||
os.remove(test_list_file_name)
|
try:
|
||||||
|
os.remove(test_list_file_name)
|
||||||
|
except Exception as err:
|
||||||
|
logger.warning(f"Imposible to remove {test_list_file_name}. Error: {err}")
|
||||||
command_to_get_test_list = self._command + f' --gtest_list_tests >> {test_list_file_name}'
|
command_to_get_test_list = self._command + f' --gtest_list_tests >> {test_list_file_name}'
|
||||||
logger.info(f"Get test list using command: {command_to_get_test_list}")
|
logger.info(f"Get test list using command: {command_to_get_test_list}")
|
||||||
run_res = run(command_to_get_test_list, check=True, shell=True)
|
run_res = run(command_to_get_test_list, check=True, shell=True)
|
||||||
|
Loading…
Reference in New Issue
Block a user