mirror of https://github.com/ARMmbed/mbed-os.git
Host test plugins: moved program cycle sleep time to host_test - this delay is used to give time device to flash copied file
parent
e984b51e49
commit
c4397b75b7
|
@ -67,6 +67,12 @@ class Mbed:
|
||||||
help="Copy method selector",
|
help="Copy method selector",
|
||||||
metavar="COPY_METHOD")
|
metavar="COPY_METHOD")
|
||||||
|
|
||||||
|
parser.add_option("-C", "--program_cycle_s",
|
||||||
|
dest="program_cycle_s",
|
||||||
|
help="Program cycle sleep. Define how many seconds you want wait after copying bianry onto target",
|
||||||
|
type="float",
|
||||||
|
metavar="COPY_METHOD")
|
||||||
|
|
||||||
parser.add_option("-t", "--timeout",
|
parser.add_option("-t", "--timeout",
|
||||||
dest="timeout",
|
dest="timeout",
|
||||||
help="Timeout",
|
help="Timeout",
|
||||||
|
@ -95,6 +101,7 @@ class Mbed:
|
||||||
self.disk = self.options.disk
|
self.disk = self.options.disk
|
||||||
self.image_path = self.options.image_path.strip('"')
|
self.image_path = self.options.image_path.strip('"')
|
||||||
self.copy_method = self.options.copy_method
|
self.copy_method = self.options.copy_method
|
||||||
|
self.program_cycle_s = float(self.options.program_cycle_s)
|
||||||
|
|
||||||
self.serial = None
|
self.serial = None
|
||||||
self.timeout = self.DEFAULT_TOUT if self.options.timeout is None else self.options.timeout
|
self.timeout = self.DEFAULT_TOUT if self.options.timeout is None else self.options.timeout
|
||||||
|
@ -192,7 +199,9 @@ class Mbed:
|
||||||
disk = disk if disk is not None else self.disk
|
disk = disk if disk is not None else self.disk
|
||||||
copy_method = copy_method if copy_method is not None else self.copy_method
|
copy_method = copy_method if copy_method is not None else self.copy_method
|
||||||
# Call proper copy method
|
# Call proper copy method
|
||||||
return self.copy_image_raw(image_path, disk, copy_method)
|
result = self.copy_image_raw(image_path, disk, copy_method)
|
||||||
|
sleep(self.program_cycle_s)
|
||||||
|
return result
|
||||||
|
|
||||||
def copy_image_raw(self, image_path=None, disk=None, copy_method=None):
|
def copy_image_raw(self, image_path=None, disk=None, copy_method=None):
|
||||||
""" Copy file depending on method you want to use. Handles exception
|
""" Copy file depending on method you want to use. Handles exception
|
||||||
|
|
|
@ -669,7 +669,6 @@ class SingleTestRunner(object):
|
||||||
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
|
print single_test_output
|
||||||
else:
|
else:
|
||||||
sleep(target_by_mcu.program_cycle_s())
|
|
||||||
# Host test execution
|
# Host test execution
|
||||||
start_host_exec_time = time()
|
start_host_exec_time = time()
|
||||||
|
|
||||||
|
@ -681,7 +680,8 @@ class SingleTestRunner(object):
|
||||||
verbose=host_test_verbose,
|
verbose=host_test_verbose,
|
||||||
reset=host_test_reset,
|
reset=host_test_reset,
|
||||||
reset_tout=reset_tout,
|
reset_tout=reset_tout,
|
||||||
copy_method=selected_copy_method)
|
copy_method=selected_copy_method,
|
||||||
|
program_cycle_s=target_by_mcu.program_cycle_s())
|
||||||
|
|
||||||
# Store test result
|
# Store test result
|
||||||
test_all_result.append(single_test_result)
|
test_all_result.append(single_test_result)
|
||||||
|
@ -759,7 +759,7 @@ class SingleTestRunner(object):
|
||||||
|
|
||||||
def run_host_test(self, name, image_path, disk, port, duration,
|
def run_host_test(self, name, image_path, disk, port, duration,
|
||||||
micro=None, reset=None, reset_tout=None,
|
micro=None, reset=None, reset_tout=None,
|
||||||
verbose=False, copy_method=None):
|
verbose=False, copy_method=None, program_cycle_s=None):
|
||||||
""" Function creates new process with host test configured with particular test case.
|
""" Function creates new process with host test configured with particular test case.
|
||||||
Function also is pooling for serial port activity from process to catch all data
|
Function also is pooling for serial port activity from process to catch all data
|
||||||
printed by test runner and host test during test execution
|
printed by test runner and host test during test execution
|
||||||
|
@ -798,7 +798,8 @@ class SingleTestRunner(object):
|
||||||
'-d', disk,
|
'-d', disk,
|
||||||
'-f', '"%s"'% image_path,
|
'-f', '"%s"'% image_path,
|
||||||
'-p', port,
|
'-p', port,
|
||||||
'-t', str(duration)]
|
'-t', str(duration),
|
||||||
|
'-C', str(program_cycle_s)]
|
||||||
|
|
||||||
# Add extra parameters to host_test
|
# Add extra parameters to host_test
|
||||||
if copy_method is not None:
|
if copy_method is not None:
|
||||||
|
|
Loading…
Reference in New Issue