Merge pull request #8309 from studavekar/fix_system_reset

use forced_reset_timeout as delay after reset
pull/8482/head
Martin Kojtal 2018-10-05 14:38:41 +02:00 committed by GitHub
commit ab0498f7a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions

View File

@ -36,9 +36,6 @@ class SystemResetTest(BaseHostTest):
def __init__(self): def __init__(self):
super(SystemResetTest, self).__init__() super(SystemResetTest, self).__init__()
self.reset = False self.reset = False
cycle_s = self.get_config_item('program_cycle_s')
self.program_cycle_s = cycle_s if cycle_s is not None else DEFAULT_CYCLE_PERIOD
self.test_steps_sequence = self.test_steps() self.test_steps_sequence = self.test_steps()
# Advance the coroutine to it's first yield statement. # Advance the coroutine to it's first yield statement.
self.test_steps_sequence.send(None) self.test_steps_sequence.send(None)
@ -61,16 +58,18 @@ class SystemResetTest(BaseHostTest):
"""Reset the device and check the status """Reset the device and check the status
""" """
system_reset = yield system_reset = yield
self.reset = False self.reset = False
wait_after_reset = self.get_config_item('forced_reset_timeout')
wait_after_reset = wait_after_reset if wait_after_reset is not None else DEFAULT_CYCLE_PERIOD
self.send_kv(MSG_KEY_DEVICE_RESET, MSG_VALUE_DUMMY) self.send_kv(MSG_KEY_DEVICE_RESET, MSG_VALUE_DUMMY)
time.sleep(self.program_cycle_s) time.sleep(wait_after_reset)
self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY) self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
system_reset = yield system_reset = yield
if self.reset == False: if self.reset == False:
raise RuntimeError('Platform did not reset as expected.') raise RuntimeError('Platform did not reset as expected.')
# The sequence is correct -- test passed. # The sequence is correct -- test passed.
yield True yield True

View File

@ -43,9 +43,9 @@ void test_system_reset()
int main(void) int main(void)
{ {
GREENTEA_SETUP(2, "system_reset"); GREENTEA_SETUP(30, "system_reset");
test_system_reset(); test_system_reset();
GREENTEA_TESTSUITE_RESULT(0); // Fail on any error. GREENTEA_TESTSUITE_RESULT(0); // Fail on any error.
return 0; return 0;
} }