mirror of https://github.com/ARMmbed/mbed-os.git
Remove autoformatting
Olli-Pekka Puolitaival
parent
3b3bed2406
commit
bf1781b005
|
|
@ -31,13 +31,11 @@ import datetime
|
|||
import threading
|
||||
import ctypes
|
||||
import functools
|
||||
import subprocess
|
||||
from colorama import Fore, Back, Style
|
||||
from prettytable import PrettyTable
|
||||
from copy import copy, deepcopy
|
||||
|
||||
from time import sleep, time
|
||||
|
||||
try:
|
||||
from Queue import Queue, Empty
|
||||
except ImportError:
|
||||
|
|
@ -116,7 +114,6 @@ class ProcessObserver(Thread):
|
|||
class SingleTestExecutor(threading.Thread):
|
||||
""" Example: Single test class in separate thread usage
|
||||
"""
|
||||
|
||||
def __init__(self, single_test):
|
||||
self.single_test = single_test
|
||||
threading.Thread.__init__(self)
|
||||
|
|
@ -137,7 +134,7 @@ class SingleTestExecutor(threading.Thread):
|
|||
# table shows text x toolchain test result matrix
|
||||
print(self.single_test.generate_test_summary_by_target(
|
||||
test_summary, shuffle_seed))
|
||||
print("Completed in %.2f sec" % (elapsed_time))
|
||||
print("Completed in %.2f sec"% (elapsed_time))
|
||||
|
||||
|
||||
class SingleTestRunner(object):
|
||||
|
|
@ -167,18 +164,18 @@ class SingleTestRunner(object):
|
|||
test_spec = {} # Test specification (from external file)
|
||||
|
||||
# mbed test suite -> SingleTestRunner
|
||||
TEST_RESULT_MAPPING = {"success": TEST_RESULT_OK,
|
||||
"failure": TEST_RESULT_FAIL,
|
||||
"error": TEST_RESULT_ERROR,
|
||||
"ioerr_copy": TEST_RESULT_IOERR_COPY,
|
||||
"ioerr_disk": TEST_RESULT_IOERR_DISK,
|
||||
"ioerr_serial": TEST_RESULT_IOERR_SERIAL,
|
||||
"timeout": TEST_RESULT_TIMEOUT,
|
||||
"no_image": TEST_RESULT_NO_IMAGE,
|
||||
"end": TEST_RESULT_UNDEF,
|
||||
"mbed_assert": TEST_RESULT_MBED_ASSERT,
|
||||
"build_failed": TEST_RESULT_BUILD_FAILED,
|
||||
"not_supproted": TEST_RESULT_NOT_SUPPORTED
|
||||
TEST_RESULT_MAPPING = {"success" : TEST_RESULT_OK,
|
||||
"failure" : TEST_RESULT_FAIL,
|
||||
"error" : TEST_RESULT_ERROR,
|
||||
"ioerr_copy" : TEST_RESULT_IOERR_COPY,
|
||||
"ioerr_disk" : TEST_RESULT_IOERR_DISK,
|
||||
"ioerr_serial" : TEST_RESULT_IOERR_SERIAL,
|
||||
"timeout" : TEST_RESULT_TIMEOUT,
|
||||
"no_image" : TEST_RESULT_NO_IMAGE,
|
||||
"end" : TEST_RESULT_UNDEF,
|
||||
"mbed_assert" : TEST_RESULT_MBED_ASSERT,
|
||||
"build_failed" : TEST_RESULT_BUILD_FAILED,
|
||||
"not_supproted" : TEST_RESULT_NOT_SUPPORTED
|
||||
}
|
||||
|
||||
def __init__(self,
|
||||
|
|
@ -299,8 +296,7 @@ class SingleTestRunner(object):
|
|||
(_hostname, _uname) = self.db_logger.get_hostname()
|
||||
_host_location = os.path.dirname(os.path.abspath(__file__))
|
||||
build_id_type = None if self.opts_only_build_tests is None else self.db_logger.BUILD_ID_TYPE_BUILD_ONLY
|
||||
self.db_logger_build_id = self.db_logger.get_next_build_id(_hostname, desc=_uname,
|
||||
location=_host_location, type=build_id_type)
|
||||
self.db_logger_build_id = self.db_logger.get_next_build_id(_hostname, desc=_uname, location=_host_location, type=build_id_type)
|
||||
self.db_logger.disconnect()
|
||||
|
||||
def dump_options(self):
|
||||
|
|
@ -311,22 +307,22 @@ class SingleTestRunner(object):
|
|||
or
|
||||
data_str = json.dumps(self.dump_options())
|
||||
"""
|
||||
result = {"db_url": str(self.opts_db_url),
|
||||
"log_file_name": str(self.opts_log_file_name),
|
||||
"shuffle_test_order": str(self.opts_shuffle_test_order),
|
||||
"shuffle_test_seed": str(self.opts_shuffle_test_seed),
|
||||
"test_by_names": str(self.opts_test_by_names),
|
||||
"peripheral_by_names": str(self.opts_peripheral_by_names),
|
||||
"test_only_peripheral": str(self.opts_test_only_peripheral),
|
||||
"test_only_common": str(self.opts_test_only_common),
|
||||
"verbose": str(self.opts_verbose),
|
||||
"firmware_global_name": str(self.opts_firmware_global_name),
|
||||
"only_build_tests": str(self.opts_only_build_tests),
|
||||
"copy_method": str(self.opts_copy_method),
|
||||
"mut_reset_type": str(self.opts_mut_reset_type),
|
||||
"jobs": str(self.opts_jobs),
|
||||
"extend_test_timeout": str(self.opts_extend_test_timeout),
|
||||
"_dummy": ''
|
||||
result = {"db_url" : str(self.opts_db_url),
|
||||
"log_file_name" : str(self.opts_log_file_name),
|
||||
"shuffle_test_order" : str(self.opts_shuffle_test_order),
|
||||
"shuffle_test_seed" : str(self.opts_shuffle_test_seed),
|
||||
"test_by_names" : str(self.opts_test_by_names),
|
||||
"peripheral_by_names" : str(self.opts_peripheral_by_names),
|
||||
"test_only_peripheral" : str(self.opts_test_only_peripheral),
|
||||
"test_only_common" : str(self.opts_test_only_common),
|
||||
"verbose" : str(self.opts_verbose),
|
||||
"firmware_global_name" : str(self.opts_firmware_global_name),
|
||||
"only_build_tests" : str(self.opts_only_build_tests),
|
||||
"copy_method" : str(self.opts_copy_method),
|
||||
"mut_reset_type" : str(self.opts_mut_reset_type),
|
||||
"jobs" : str(self.opts_jobs),
|
||||
"extend_test_timeout" : str(self.opts_extend_test_timeout),
|
||||
"_dummy" : ''
|
||||
}
|
||||
return result
|
||||
|
||||
|
|
@ -369,6 +365,7 @@ class SingleTestRunner(object):
|
|||
'shuffle_random_seed': self.shuffle_random_seed
|
||||
}
|
||||
|
||||
|
||||
# print '=== %s::%s ===' % (target, toolchain)
|
||||
# Let's build our test
|
||||
if target not in TARGET_MAP:
|
||||
|
|
@ -398,7 +395,7 @@ class SingleTestRunner(object):
|
|||
print(self.logger.log_line(
|
||||
self.logger.LogType.NOTIF,
|
||||
'Skipped tests for %s target. Toolchain %s is not '
|
||||
'supported for this target' % (T.name, toolchain)))
|
||||
'supported for this target'% (T.name, toolchain)))
|
||||
continue
|
||||
|
||||
except ToolException:
|
||||
|
|
@ -441,13 +438,13 @@ class SingleTestRunner(object):
|
|||
_extra=json.dumps(self.dump_options()))
|
||||
self.db_logger.disconnect();
|
||||
|
||||
valid_test_map_keys = self.get_valid_tests(test_map_keys, target, toolchain, test_ids,
|
||||
self.opts_include_non_automated)
|
||||
valid_test_map_keys = self.get_valid_tests(test_map_keys, target, toolchain, test_ids, self.opts_include_non_automated)
|
||||
skipped_test_map_keys = self.get_skipped_tests(test_map_keys, valid_test_map_keys)
|
||||
|
||||
for skipped_test_id in skipped_test_map_keys:
|
||||
test_suite_properties['skipped'].append(skipped_test_id)
|
||||
|
||||
|
||||
# First pass through all tests and determine which libraries need to be built
|
||||
libraries = []
|
||||
for test_id in valid_test_map_keys:
|
||||
|
|
@ -459,6 +456,7 @@ class SingleTestRunner(object):
|
|||
if lib['build_dir'] in test.dependencies and lib['id'] not in libraries:
|
||||
libraries.append(lib['id'])
|
||||
|
||||
|
||||
clean_project_options = True if self.opts_goanna_for_tests or clean or self.opts_clean else None
|
||||
|
||||
# Build all required libraries
|
||||
|
|
@ -480,10 +478,11 @@ class SingleTestRunner(object):
|
|||
'There were errors while building library %s' % lib_id))
|
||||
continue
|
||||
|
||||
|
||||
for test_id in valid_test_map_keys:
|
||||
test = TEST_MAP[test_id]
|
||||
|
||||
test_suite_properties['test.libs.%s.%s.%s' % (target, toolchain, test_id)] = ', '.join(libraries)
|
||||
test_suite_properties['test.libs.%s.%s.%s'% (target, toolchain, test_id)] = ', '.join(libraries)
|
||||
|
||||
# TODO: move this 2 below loops to separate function
|
||||
INC_DIRS = []
|
||||
|
|
@ -495,10 +494,10 @@ class SingleTestRunner(object):
|
|||
for lib_id in libraries:
|
||||
if 'macros' in LIBRARY_MAP[lib_id] and LIBRARY_MAP[lib_id]['macros']:
|
||||
MACROS.extend(LIBRARY_MAP[lib_id]['macros'])
|
||||
MACROS.append('TEST_SUITE_TARGET_NAME="%s"' % target)
|
||||
MACROS.append('TEST_SUITE_TEST_ID="%s"' % test_id)
|
||||
MACROS.append('TEST_SUITE_TARGET_NAME="%s"'% target)
|
||||
MACROS.append('TEST_SUITE_TEST_ID="%s"'% test_id)
|
||||
test_uuid = uuid.uuid4()
|
||||
MACROS.append('TEST_SUITE_UUID="%s"' % str(test_uuid))
|
||||
MACROS.append('TEST_SUITE_UUID="%s"'% str(test_uuid))
|
||||
|
||||
# Prepare extended test results data structure (it can be used to generate detailed test report)
|
||||
if target not in self.test_summary_ext:
|
||||
|
|
@ -524,6 +523,7 @@ class SingleTestRunner(object):
|
|||
except Exception as e:
|
||||
project_name_str = project_name if project_name is not None else test_id
|
||||
|
||||
|
||||
test_result = self.TEST_RESULT_FAIL
|
||||
|
||||
if isinstance(e, ToolException):
|
||||
|
|
@ -538,6 +538,7 @@ class SingleTestRunner(object):
|
|||
'Project %s is not supported' % project_name_str))
|
||||
test_result = self.TEST_RESULT_NOT_SUPPORTED
|
||||
|
||||
|
||||
# Append test results to global test summary
|
||||
self.test_summary.append(
|
||||
(test_result, target, toolchain, test_id,
|
||||
|
|
@ -548,17 +549,17 @@ class SingleTestRunner(object):
|
|||
if test_id not in self.test_summary_ext[target][toolchain]:
|
||||
self.test_summary_ext[target][toolchain][test_id] = []
|
||||
|
||||
self.test_summary_ext[target][toolchain][test_id].append({0: {
|
||||
'result': test_result,
|
||||
'output': '',
|
||||
'target_name': target,
|
||||
self.test_summary_ext[target][toolchain][test_id].append({ 0: {
|
||||
'result' : test_result,
|
||||
'output' : '',
|
||||
'target_name' : target,
|
||||
'target_name_unique': target,
|
||||
'toolchain_name': toolchain,
|
||||
'id': test_id,
|
||||
'description': test.get_description(),
|
||||
'elapsed_time': 0,
|
||||
'duration': 0,
|
||||
'copy_method': None
|
||||
'toolchain_name' : toolchain,
|
||||
'id' : test_id,
|
||||
'description' : test.get_description(),
|
||||
'elapsed_time' : 0,
|
||||
'duration' : 0,
|
||||
'copy_method' : None
|
||||
}})
|
||||
continue
|
||||
|
||||
|
|
@ -576,9 +577,9 @@ class SingleTestRunner(object):
|
|||
test_spec = self.shape_test_request(target, path, test_id, test_duration)
|
||||
test_loops = self.get_test_loop_count(test_id)
|
||||
|
||||
test_suite_properties['test.duration.%s.%s.%s' % (target, toolchain, test_id)] = test_duration
|
||||
test_suite_properties['test.loops.%s.%s.%s' % (target, toolchain, test_id)] = test_loops
|
||||
test_suite_properties['test.path.%s.%s.%s' % (target, toolchain, test_id)] = path
|
||||
test_suite_properties['test.duration.%s.%s.%s'% (target, toolchain, test_id)] = test_duration
|
||||
test_suite_properties['test.loops.%s.%s.%s'% (target, toolchain, test_id)] = test_loops
|
||||
test_suite_properties['test.path.%s.%s.%s'% (target, toolchain, test_id)] = path
|
||||
|
||||
# read MUTs, test specification and perform tests
|
||||
handle_results = self.handle(test_spec, target, toolchain, test_loops=test_loops)
|
||||
|
|
@ -626,6 +627,7 @@ class SingleTestRunner(object):
|
|||
if self.opts_shuffle_test_seed is not None and self.is_shuffle_seed_float():
|
||||
self.shuffle_random_seed = round(float(self.opts_shuffle_test_seed), self.SHUFFLE_SEED_ROUND)
|
||||
|
||||
|
||||
if self.opts_parallel_test_exec:
|
||||
###################################################################
|
||||
# Experimental, parallel test execution per singletest instance.
|
||||
|
|
@ -638,8 +640,7 @@ class SingleTestRunner(object):
|
|||
# get information about available MUTs (per target).
|
||||
for target, toolchains in self.test_spec['targets'].items():
|
||||
self.test_suite_properties_ext[target] = {}
|
||||
t = threading.Thread(target=self.execute_thread_slice, args=(
|
||||
q, target, toolchains, clean, test_ids, self.build_report, self.build_properties))
|
||||
t = threading.Thread(target=self.execute_thread_slice, args = (q, target, toolchains, clean, test_ids, self.build_report, self.build_properties))
|
||||
t.daemon = True
|
||||
t.start()
|
||||
execute_threads.append(t)
|
||||
|
|
@ -652,15 +653,13 @@ class SingleTestRunner(object):
|
|||
if target not in self.test_suite_properties_ext:
|
||||
self.test_suite_properties_ext[target] = {}
|
||||
|
||||
self.execute_thread_slice(q, target, toolchains, clean, test_ids, self.build_report,
|
||||
self.build_properties)
|
||||
self.execute_thread_slice(q, target, toolchains, clean, test_ids, self.build_report, self.build_properties)
|
||||
q.get()
|
||||
|
||||
if self.db_logger:
|
||||
self.db_logger.reconnect();
|
||||
if self.db_logger.is_connected():
|
||||
self.db_logger.update_build_id_info(self.db_logger_build_id,
|
||||
_status_fk=self.db_logger.BUILD_ID_STATUS_COMPLETED)
|
||||
self.db_logger.update_build_id_info(self.db_logger_build_id, _status_fk=self.db_logger.BUILD_ID_STATUS_COMPLETED)
|
||||
self.db_logger.disconnect();
|
||||
|
||||
return self.test_summary, self.shuffle_random_seed, self.test_summary_ext, self.test_suite_properties_ext, self.build_report, self.build_properties
|
||||
|
|
@ -782,9 +781,9 @@ class SingleTestRunner(object):
|
|||
row.append(test_results[toolchain])
|
||||
pt.add_row(row)
|
||||
result += pt.get_string()
|
||||
shuffle_seed_text = "Shuffle Seed: %.*f" % (self.SHUFFLE_SEED_ROUND,
|
||||
shuffle_seed_text = "Shuffle Seed: %.*f"% (self.SHUFFLE_SEED_ROUND,
|
||||
shuffle_seed if shuffle_seed else self.shuffle_random_seed)
|
||||
result += "\n%s" % (shuffle_seed_text if self.opts_shuffle_test_order else '')
|
||||
result += "\n%s"% (shuffle_seed_text if self.opts_shuffle_test_order else '')
|
||||
return result
|
||||
|
||||
def generate_test_summary(self, test_summary, shuffle_seed=None):
|
||||
|
|
@ -803,18 +802,18 @@ class SingleTestRunner(object):
|
|||
pt.align["Test Description"] = "l" # Left align
|
||||
pt.padding_width = 1 # One space between column edges and contents (default)
|
||||
|
||||
result_dict = {self.TEST_RESULT_OK: 0,
|
||||
self.TEST_RESULT_FAIL: 0,
|
||||
self.TEST_RESULT_ERROR: 0,
|
||||
self.TEST_RESULT_UNDEF: 0,
|
||||
self.TEST_RESULT_IOERR_COPY: 0,
|
||||
self.TEST_RESULT_IOERR_DISK: 0,
|
||||
self.TEST_RESULT_IOERR_SERIAL: 0,
|
||||
self.TEST_RESULT_NO_IMAGE: 0,
|
||||
self.TEST_RESULT_TIMEOUT: 0,
|
||||
self.TEST_RESULT_MBED_ASSERT: 0,
|
||||
self.TEST_RESULT_BUILD_FAILED: 0,
|
||||
self.TEST_RESULT_NOT_SUPPORTED: 0
|
||||
result_dict = {self.TEST_RESULT_OK : 0,
|
||||
self.TEST_RESULT_FAIL : 0,
|
||||
self.TEST_RESULT_ERROR : 0,
|
||||
self.TEST_RESULT_UNDEF : 0,
|
||||
self.TEST_RESULT_IOERR_COPY : 0,
|
||||
self.TEST_RESULT_IOERR_DISK : 0,
|
||||
self.TEST_RESULT_IOERR_SERIAL : 0,
|
||||
self.TEST_RESULT_NO_IMAGE : 0,
|
||||
self.TEST_RESULT_TIMEOUT : 0,
|
||||
self.TEST_RESULT_MBED_ASSERT : 0,
|
||||
self.TEST_RESULT_BUILD_FAILED : 0,
|
||||
self.TEST_RESULT_NOT_SUPPORTED : 0
|
||||
}
|
||||
|
||||
for test in test_summary:
|
||||
|
|
@ -825,11 +824,10 @@ class SingleTestRunner(object):
|
|||
result += "\n"
|
||||
|
||||
# Print result count
|
||||
result += "Result: " + ' / '.join(
|
||||
['%s %s' % (value, key) for (key, value) in {k: v for k, v in result_dict.items() if v != 0}.items()])
|
||||
shuffle_seed_text = "Shuffle Seed: %.*f\n" % (self.SHUFFLE_SEED_ROUND,
|
||||
result += "Result: " + ' / '.join(['%s %s' % (value, key) for (key, value) in {k: v for k, v in result_dict.items() if v != 0}.items()])
|
||||
shuffle_seed_text = "Shuffle Seed: %.*f\n"% (self.SHUFFLE_SEED_ROUND,
|
||||
shuffle_seed if shuffle_seed else self.shuffle_random_seed)
|
||||
result += "\n%s" % (shuffle_seed_text if self.opts_shuffle_test_order else '')
|
||||
result += "\n%s"% (shuffle_seed_text if self.opts_shuffle_test_order else '')
|
||||
return result
|
||||
|
||||
def test_loop_list_to_dict(self, test_loops_str):
|
||||
|
|
@ -947,8 +945,7 @@ class SingleTestRunner(object):
|
|||
if not exists(image_path):
|
||||
single_test_result = self.TEST_RESULT_NO_IMAGE
|
||||
elapsed_time = 0
|
||||
single_test_output = self.logger.log_line(self.logger.LogType.ERROR,
|
||||
'Image file does not exist: %s' % image_path)
|
||||
single_test_output = self.logger.log_line(self.logger.LogType.ERROR, 'Image file does not exist: %s'% image_path)
|
||||
print(single_test_output)
|
||||
else:
|
||||
# Host test execution
|
||||
|
|
@ -972,16 +969,16 @@ class SingleTestRunner(object):
|
|||
elapsed_time = single_testduration # TIme of single test case execution after reset
|
||||
|
||||
detailed_test_results[test_index] = {
|
||||
'result': single_test_result,
|
||||
'output': single_test_output,
|
||||
'target_name': target_name,
|
||||
'target_name_unique': target_name_unique,
|
||||
'toolchain_name': toolchain_name,
|
||||
'id': test_id,
|
||||
'description': test_description,
|
||||
'elapsed_time': round(elapsed_time, 2),
|
||||
'duration': single_timeout,
|
||||
'copy_method': _copy_method,
|
||||
'result' : single_test_result,
|
||||
'output' : single_test_output,
|
||||
'target_name' : target_name,
|
||||
'target_name_unique' : target_name_unique,
|
||||
'toolchain_name' : toolchain_name,
|
||||
'id' : test_id,
|
||||
'description' : test_description,
|
||||
'elapsed_time' : round(elapsed_time, 2),
|
||||
'duration' : single_timeout,
|
||||
'copy_method' : _copy_method,
|
||||
}
|
||||
|
||||
print(self.print_test_result(
|
||||
|
|
@ -1009,8 +1006,7 @@ class SingleTestRunner(object):
|
|||
if self.db_logger:
|
||||
self.db_logger.disconnect()
|
||||
|
||||
return (self.shape_global_test_loop_result(test_all_result,
|
||||
self.opts_waterfall_test and self.opts_consolidate_waterfall_test),
|
||||
return (self.shape_global_test_loop_result(test_all_result, self.opts_waterfall_test and self.opts_consolidate_waterfall_test),
|
||||
target_name_unique,
|
||||
toolchain_name,
|
||||
test_id,
|
||||
|
|
@ -1048,7 +1044,7 @@ class SingleTestRunner(object):
|
|||
tokens.append(test_description)
|
||||
separator = "::"
|
||||
time_info = " in %.2f of %d sec" % (round(elapsed_time, 2), duration)
|
||||
result = separator.join(tokens) + " [" + test_result + "]" + time_info
|
||||
result = separator.join(tokens) + " [" + test_result +"]" + time_info
|
||||
return Fore.MAGENTA + result + Fore.RESET
|
||||
|
||||
def shape_test_loop_ok_result_count(self, test_all_result):
|
||||
|
|
@ -1056,7 +1052,7 @@ class SingleTestRunner(object):
|
|||
"""
|
||||
test_loop_count = len(test_all_result)
|
||||
test_loop_ok_result = test_all_result.count(self.TEST_RESULT_OK)
|
||||
return "%d/%d" % (test_loop_ok_result, test_loop_count)
|
||||
return "%d/%d"% (test_loop_ok_result, test_loop_count)
|
||||
|
||||
def shape_global_test_loop_result(self, test_all_result, waterfall_and_consolidate):
|
||||
""" Reformats list of results to simple string
|
||||
|
|
@ -1110,16 +1106,16 @@ class SingleTestRunner(object):
|
|||
Returns string
|
||||
"""
|
||||
result = None
|
||||
if re.search("HOST: Property '%s'" % property_name, line) is not None:
|
||||
property = re.search("HOST: Property '%s' = '([\w\d _]+)'" % property_name, line)
|
||||
if re.search("HOST: Property '%s'"% property_name, line) is not None:
|
||||
property = re.search("HOST: Property '%s' = '([\w\d _]+)'"% property_name, line)
|
||||
if property is not None and len(property.groups()) == 1:
|
||||
result = property.groups()[0]
|
||||
return result
|
||||
|
||||
cmd = ["python",
|
||||
'%s.py' % name,
|
||||
'%s.py'% name,
|
||||
'-d', disk,
|
||||
'-f', '"%s"' % image_path,
|
||||
'-f', '"%s"'% image_path,
|
||||
'-p', port,
|
||||
'-t', str(duration),
|
||||
'-C', str(program_cycle_s)]
|
||||
|
|
@ -1260,9 +1256,9 @@ def show_json_file_format_error(json_spec_filename, line, column):
|
|||
line_no = 1
|
||||
for json_line in data_file:
|
||||
if line_no + 5 >= line: # Print last few lines before error
|
||||
print('Line %d:\t' % line_no + json_line)
|
||||
print('Line %d:\t'%line_no + json_line)
|
||||
if line_no == line:
|
||||
print('%s\t%s^'(' ' * len('Line %d:' % line_no),
|
||||
print('%s\t%s^' (' ' * len('Line %d:' % line_no),
|
||||
'-' * (column - 1)))
|
||||
break
|
||||
line_no += 1
|
||||
|
|
@ -1311,7 +1307,7 @@ def get_json_data_from_file(json_spec_filename, verbose=False):
|
|||
show_json_file_format_error(json_spec_filename, line, column)
|
||||
|
||||
except IOError as fileopen_error_msg:
|
||||
print('JSON file %s not opened. Reason: %s\n' %
|
||||
print('JSON file %s not opened. Reason: %s\n'%
|
||||
(json_spec_filename, fileopen_error_msg))
|
||||
if verbose and result:
|
||||
pp = pprint.PrettyPrinter(indent=4)
|
||||
|
|
@ -1384,7 +1380,7 @@ def print_test_configuration_from_json(json_data, join_delim=", "):
|
|||
target_supported_toolchains = get_target_supported_toolchains(target)
|
||||
if not target_supported_toolchains:
|
||||
target_supported_toolchains = []
|
||||
target_name = target if target in TARGET_MAP else "%s*" % target
|
||||
target_name = target if target in TARGET_MAP else "%s*"% target
|
||||
row = [target_name]
|
||||
toolchains = targets[target]
|
||||
|
||||
|
|
@ -1421,21 +1417,21 @@ def print_test_configuration_from_json(json_data, join_delim=", "):
|
|||
result += "Toolchain conflicts:\n"
|
||||
for target in toolchain_conflicts:
|
||||
if target not in TARGET_MAP:
|
||||
result += "\t* Target %s unknown\n" % (target)
|
||||
result += "\t* Target %s unknown\n"% (target)
|
||||
conflict_target_list = join_delim.join(toolchain_conflicts[target])
|
||||
sufix = 's' if len(toolchain_conflicts[target]) > 1 else ''
|
||||
result += "\t* Target %s does not support %s toolchain%s\n" % (target, conflict_target_list, sufix)
|
||||
result += "\t* Target %s does not support %s toolchain%s\n"% (target, conflict_target_list, sufix)
|
||||
|
||||
for toolchain in toolchain_path_conflicts:
|
||||
# Let's check toolchain configuration
|
||||
if toolchain in TOOLCHAIN_PATHS:
|
||||
toolchain_path = TOOLCHAIN_PATHS[toolchain]
|
||||
if not os.path.isdir(toolchain_path):
|
||||
result += "\t# Toolchain %s path not found: %s\n" % (toolchain, toolchain_path)
|
||||
result += "\t# Toolchain %s path not found: %s\n"% (toolchain, toolchain_path)
|
||||
return result
|
||||
|
||||
|
||||
def get_avail_tests_summary_table(cols=None, result_summary=True, join_delim=',', platform_filter=None):
|
||||
def get_avail_tests_summary_table(cols=None, result_summary=True, join_delim=',',platform_filter=None):
|
||||
""" Generates table summary with all test cases and additional test cases
|
||||
information using pretty print functionality. Allows test suite user to
|
||||
see test cases
|
||||
|
|
@ -1520,8 +1516,7 @@ def get_avail_tests_summary_table(cols=None, result_summary=True, join_delim=','
|
|||
pt.align['percent [%]'] = "r"
|
||||
for unique_id in unique_test_id:
|
||||
# print "\t\t%s: %d / %d" % (unique_id, counter_dict_test_id_types[unique_id], counter_dict_test_id_types_all[unique_id])
|
||||
percent_progress = round(
|
||||
100.0 * counter_dict_test_id_types[unique_id] / float(counter_dict_test_id_types_all[unique_id]), 1)
|
||||
percent_progress = round(100.0 * counter_dict_test_id_types[unique_id] / float(counter_dict_test_id_types_all[unique_id]), 1)
|
||||
str_progress = progress_bar(percent_progress, 75)
|
||||
row = [unique_id,
|
||||
counter_dict_test_id_types[unique_id],
|
||||
|
|
@ -1578,32 +1573,26 @@ def singletest_in_cli_mode(single_test):
|
|||
if single_test.opts_report_html_file_name:
|
||||
# Export results in form of HTML report to separate file
|
||||
report_exporter = ReportExporter(ResultExporterType.HTML)
|
||||
report_exporter.report_to_file(test_summary_ext, single_test.opts_report_html_file_name,
|
||||
test_suite_properties=test_suite_properties_ext)
|
||||
report_exporter.report_to_file(test_summary_ext, single_test.opts_report_html_file_name, test_suite_properties=test_suite_properties_ext)
|
||||
if single_test.opts_report_junit_file_name:
|
||||
# Export results in form of JUnit XML report to separate file
|
||||
report_exporter = ReportExporter(ResultExporterType.JUNIT)
|
||||
report_exporter.report_to_file(test_summary_ext, single_test.opts_report_junit_file_name,
|
||||
test_suite_properties=test_suite_properties_ext)
|
||||
report_exporter.report_to_file(test_summary_ext, single_test.opts_report_junit_file_name, test_suite_properties=test_suite_properties_ext)
|
||||
if single_test.opts_report_text_file_name:
|
||||
# Export results in form of a text file
|
||||
report_exporter = ReportExporter(ResultExporterType.TEXT)
|
||||
report_exporter.report_to_file(test_summary_ext, single_test.opts_report_text_file_name,
|
||||
test_suite_properties=test_suite_properties_ext)
|
||||
report_exporter.report_to_file(test_summary_ext, single_test.opts_report_text_file_name, test_suite_properties=test_suite_properties_ext)
|
||||
if single_test.opts_report_build_file_name:
|
||||
# Export build results as html report to sparate file
|
||||
report_exporter = ReportExporter(ResultExporterType.JUNIT, package="build")
|
||||
report_exporter.report_to_file(build_report, single_test.opts_report_build_file_name,
|
||||
test_suite_properties=build_properties)
|
||||
report_exporter.report_to_file(build_report, single_test.opts_report_build_file_name, test_suite_properties=build_properties)
|
||||
|
||||
# Returns True if no build failures of the test projects or their dependencies
|
||||
return status
|
||||
|
||||
|
||||
class TestLogger():
|
||||
""" Super-class for logging and printing ongoing events for test suite pass
|
||||
"""
|
||||
|
||||
def __init__(self, store_log=True):
|
||||
""" We can control if logger actually stores log in memory
|
||||
or just handled all log entries immediately
|
||||
|
|
@ -1626,10 +1615,10 @@ class TestLogger():
|
|||
""" Log one line of text
|
||||
"""
|
||||
log_timestamp = time()
|
||||
log_entry = {'log_type': LogType,
|
||||
'log_timestamp': log_timestamp,
|
||||
'log_line': log_line,
|
||||
'_future': None
|
||||
log_entry = {'log_type' : LogType,
|
||||
'log_timestamp' : log_timestamp,
|
||||
'log_line' : log_line,
|
||||
'_future' : None
|
||||
}
|
||||
# Store log in memory
|
||||
if self.store_log:
|
||||
|
|
@ -1640,20 +1629,18 @@ class TestLogger():
|
|||
class CLITestLogger(TestLogger):
|
||||
""" Logger used with CLI (Command line interface) test suite. Logs on screen and to file if needed
|
||||
"""
|
||||
|
||||
def __init__(self, store_log=True, file_name=None):
|
||||
TestLogger.__init__(self)
|
||||
self.log_file_name = file_name
|
||||
# self.TIMESTAMP_FORMAT = '%y-%m-%d %H:%M:%S' # Full date and time
|
||||
#self.TIMESTAMP_FORMAT = '%y-%m-%d %H:%M:%S' # Full date and time
|
||||
self.TIMESTAMP_FORMAT = '%H:%M:%S' # Time only
|
||||
|
||||
def log_print(self, log_entry, timestamp=True):
|
||||
""" Prints on screen formatted log entry
|
||||
"""
|
||||
ts = log_entry['log_timestamp']
|
||||
timestamp_str = datetime.datetime.fromtimestamp(ts).strftime(
|
||||
"[%s] " % self.TIMESTAMP_FORMAT) if timestamp else ''
|
||||
log_line_str = "%(log_type)s: %(log_line)s" % (log_entry)
|
||||
timestamp_str = datetime.datetime.fromtimestamp(ts).strftime("[%s] "% self.TIMESTAMP_FORMAT) if timestamp else ''
|
||||
log_line_str = "%(log_type)s: %(log_line)s"% (log_entry)
|
||||
return timestamp_str + log_line_str
|
||||
|
||||
def log_line(self, LogType, log_line, timestamp=True, line_delim='\n'):
|
||||
|
|
@ -1691,7 +1678,7 @@ def detect_database_verbose(db_url):
|
|||
if result is not None:
|
||||
# Parsing passed
|
||||
(db_type, username, password, host, db_name) = result
|
||||
# print "DB type '%s', user name '%s', password '%s', host '%s', db name '%s'"% result
|
||||
#print "DB type '%s', user name '%s', password '%s', host '%s', db name '%s'"% result
|
||||
# Let's try to connect
|
||||
db_ = factory_db_logger(db_url)
|
||||
if db_ is not None:
|
||||
|
|
@ -1715,12 +1702,11 @@ def get_module_avail(module_name):
|
|||
"""
|
||||
return module_name in sys.modules.keys()
|
||||
|
||||
|
||||
def get_autodetected_MUTS_list(platform_name_filter=None):
|
||||
oldError = None
|
||||
if os.name == 'nt':
|
||||
# Disable Windows error box temporarily
|
||||
oldError = ctypes.windll.kernel32.SetErrorMode(1) # note that SEM_FAILCRITICALERRORS = 1
|
||||
oldError = ctypes.windll.kernel32.SetErrorMode(1) #note that SEM_FAILCRITICALERRORS = 1
|
||||
|
||||
mbeds = mbed_lstools.create()
|
||||
detect_muts_list = mbeds.list_mbeds()
|
||||
|
|
@ -1730,7 +1716,6 @@ def get_autodetected_MUTS_list(platform_name_filter=None):
|
|||
|
||||
return get_autodetected_MUTS(detect_muts_list, platform_name_filter=platform_name_filter)
|
||||
|
||||
|
||||
def get_autodetected_MUTS(mbeds_list, platform_name_filter=None):
|
||||
""" Function detects all connected to host mbed-enabled devices and generates artificial MUTS file.
|
||||
If function fails to auto-detect devices it will return empty dictionary.
|
||||
|
|
@ -1755,8 +1740,7 @@ def get_autodetected_MUTS(mbeds_list, platform_name_filter=None):
|
|||
# For mcu_unique - we are assigning 'platform_name_unique' value from mbedls output (if its existing)
|
||||
# if not we are creating our own unique value (last few chars from platform's target_id).
|
||||
m = {'mcu': mut['platform_name'],
|
||||
'mcu_unique': mut['platform_name_unique'] if 'platform_name_unique' in mut else "%s[%s]" % (
|
||||
mut['platform_name'], mut['target_id'][-4:]),
|
||||
'mcu_unique' : mut['platform_name_unique'] if 'platform_name_unique' in mut else "%s[%s]" % (mut['platform_name'], mut['target_id'][-4:]),
|
||||
'port': mut['serial_port'],
|
||||
'disk': mut['mount_point'],
|
||||
'peripherals': [] # No peripheral detection
|
||||
|
|
@ -1780,7 +1764,7 @@ def get_autodetected_TEST_SPEC(mbeds_list,
|
|||
use_supported_toolchains - if True add all supported toolchains to test_spec
|
||||
toolchain_filter - if [...list of toolchains...] add from all toolchains only those in filter to test_spec
|
||||
"""
|
||||
result = {'targets': {}}
|
||||
result = {'targets': {} }
|
||||
|
||||
for mut in mbeds_list:
|
||||
mcu = mut['mcu']
|
||||
|
|
@ -1884,7 +1868,7 @@ def get_default_test_options_parser():
|
|||
parser.add_argument('-c', '--copy-method',
|
||||
dest='copy_method',
|
||||
type=argparse_uppercase_type(copy_methods, "flash method"),
|
||||
help="Select binary copy (flash) method. Default is Python's shutil.copy() method. %s" % copy_methods_str)
|
||||
help="Select binary copy (flash) method. Default is Python's shutil.copy() method. %s"% copy_methods_str)
|
||||
|
||||
reset_methods = host_tests_plugins.get_plugin_caps('ResetMethod')
|
||||
reset_methods_str = "Plugin support: " + ', '.join(reset_methods)
|
||||
|
|
@ -1893,7 +1877,7 @@ def get_default_test_options_parser():
|
|||
dest='mut_reset_type',
|
||||
default=None,
|
||||
type=argparse_uppercase_type(reset_methods, "reset method"),
|
||||
help='Extra reset method used to reset MUT by host test script. %s' % reset_methods_str)
|
||||
help='Extra reset method used to reset MUT by host test script. %s'% reset_methods_str)
|
||||
|
||||
parser.add_argument('-g', '--goanna-for-tests',
|
||||
dest='goanna_for_tests',
|
||||
|
|
@ -2057,20 +2041,18 @@ def get_default_test_options_parser():
|
|||
help="Depth level for static memory report")
|
||||
return parser
|
||||
|
||||
|
||||
def test_path_to_name(path, base):
|
||||
"""Change all slashes in a path into hyphens
|
||||
This creates a unique cross-platform test name based on the path
|
||||
This can eventually be overriden by a to-be-determined meta-data mechanism"""
|
||||
name_parts = []
|
||||
head, tail = os.path.split(relpath(path, base))
|
||||
head, tail = os.path.split(relpath(path,base))
|
||||
while (tail and tail != "."):
|
||||
name_parts.insert(0, tail)
|
||||
head, tail = os.path.split(head)
|
||||
|
||||
return "-".join(name_parts).lower()
|
||||
|
||||
|
||||
def get_test_config(config_name, target_name):
|
||||
"""Finds the path to a test configuration file
|
||||
config_name: path to a custom configuration file OR mbed OS interface "ethernet, wifi_odin, etc"
|
||||
|
|
@ -2169,7 +2151,6 @@ def print_tests(tests, format="list", sort=True):
|
|||
print("Unknown format '%s'" % format)
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
def norm_relative_path(path, start):
|
||||
"""This function will create a normalized, relative path. It mimics the
|
||||
python os.path.relpath function, but also normalizes a Windows-syle path
|
||||
|
|
@ -2383,5 +2364,3 @@ def test_spec_from_test_builds(test_builds):
|
|||
return {
|
||||
"builds": test_builds
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue