mirror of https://github.com/ARMmbed/mbed-os.git
Tests: Watchdog: Update test case teardown
Added a mechanism which will prevent an initialised watchdog from resetting the device during final greentea communication. This allows testing watchdog timeouts as short as 50 ms.pull/10777/head
parent
e3bcf0cebf
commit
c29cdab079
|
@ -24,6 +24,7 @@
|
||||||
#include "unity/unity.h"
|
#include "unity/unity.h"
|
||||||
#include "utest/utest.h"
|
#include "utest/utest.h"
|
||||||
#include "watchdog_api_tests.h"
|
#include "watchdog_api_tests.h"
|
||||||
|
#include "mbed.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
@ -35,6 +36,10 @@
|
||||||
#define WORST_TIMEOUT_RESOLUTION_MS 8UL
|
#define WORST_TIMEOUT_RESOLUTION_MS 8UL
|
||||||
|
|
||||||
#define TIMEOUT_DELTA_MS (WORST_TIMEOUT_RESOLUTION_MS)
|
#define TIMEOUT_DELTA_MS (WORST_TIMEOUT_RESOLUTION_MS)
|
||||||
|
|
||||||
|
// Do not set watchdog timeout shorter than 50 ms as it may cause the
|
||||||
|
// host-test-runner return 'TIMEOUT' instead of 'FAIL' / 'PASS' if watchdog
|
||||||
|
// performs reset during test suite teardown.
|
||||||
#define WDG_TIMEOUT_MS 500UL
|
#define WDG_TIMEOUT_MS 500UL
|
||||||
|
|
||||||
#define MSG_VALUE_DUMMY "0"
|
#define MSG_VALUE_DUMMY "0"
|
||||||
|
@ -69,6 +74,18 @@ using utest::v1::Harness;
|
||||||
|
|
||||||
const watchdog_config_t WDG_CONFIG_DEFAULT = { .timeout_ms = WDG_TIMEOUT_MS };
|
const watchdog_config_t WDG_CONFIG_DEFAULT = { .timeout_ms = WDG_TIMEOUT_MS };
|
||||||
|
|
||||||
|
Thread wdg_kicking_thread;
|
||||||
|
Semaphore kick_wdg_during_test_teardown(0, 1);
|
||||||
|
|
||||||
|
void wdg_kicking_thread_fun()
|
||||||
|
{
|
||||||
|
kick_wdg_during_test_teardown.wait();
|
||||||
|
while (true) {
|
||||||
|
hal_watchdog_kick();
|
||||||
|
wait_ms(20);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void test_max_timeout_is_valid()
|
void test_max_timeout_is_valid()
|
||||||
{
|
{
|
||||||
TEST_ASSERT(hal_watchdog_get_platform_features().max_timeout > 1UL);
|
TEST_ASSERT(hal_watchdog_get_platform_features().max_timeout > 1UL);
|
||||||
|
@ -133,6 +150,8 @@ utest::v1::status_t case_setup_sync_on_reset(const Case *const source, const siz
|
||||||
utest::v1::status_t case_teardown_sync_on_reset(const Case *const source, const size_t passed, const size_t failed,
|
utest::v1::status_t case_teardown_sync_on_reset(const Case *const source, const size_t passed, const size_t failed,
|
||||||
const utest::v1::failure_t failure)
|
const utest::v1::failure_t failure)
|
||||||
{
|
{
|
||||||
|
// Unlock kicking the watchdog during teardown.
|
||||||
|
kick_wdg_during_test_teardown.release();
|
||||||
utest::v1::status_t status = utest::v1::greentea_case_teardown_handler(source, passed, failed, failure);
|
utest::v1::status_t status = utest::v1::greentea_case_teardown_handler(source, passed, failed, failure);
|
||||||
if (failed) {
|
if (failed) {
|
||||||
/* Return immediately and skip the device reset, if the test case failed.
|
/* Return immediately and skip the device reset, if the test case failed.
|
||||||
|
@ -206,6 +225,10 @@ int testsuite_setup_sync_on_reset(const size_t number_of_cases)
|
||||||
return utest::v1::STATUS_ABORT;
|
return utest::v1::STATUS_ABORT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The thread is started here, but feeding the watchdog will start
|
||||||
|
// when the semaphore is released during a test case teardown.
|
||||||
|
wdg_kicking_thread.start(mbed::callback(wdg_kicking_thread_fun));
|
||||||
|
|
||||||
utest_printf("Starting with test case index %i of all %i defined test cases.\n", CASE_INDEX_START, number_of_cases);
|
utest_printf("Starting with test case index %i of all %i defined test cases.\n", CASE_INDEX_START, number_of_cases);
|
||||||
return CASE_INDEX_START;
|
return CASE_INDEX_START;
|
||||||
}
|
}
|
||||||
|
@ -220,9 +243,6 @@ Case cases[] = {
|
||||||
test_update_config,
|
test_update_config,
|
||||||
(utest::v1::case_teardown_handler_t) case_teardown_wdg_stop_or_reset),
|
(utest::v1::case_teardown_handler_t) case_teardown_wdg_stop_or_reset),
|
||||||
|
|
||||||
// Do not set watchdog timeout shorter than 500 ms as it may cause the
|
|
||||||
// host-test-runner return 'TIMEOUT' instead of 'FAIL' / 'PASS' if watchdog
|
|
||||||
// performs reset during test suite teardown.
|
|
||||||
Case("Init, 500 ms", (utest::v1::case_setup_handler_t) case_setup_sync_on_reset,
|
Case("Init, 500 ms", (utest::v1::case_setup_handler_t) case_setup_sync_on_reset,
|
||||||
test_init<500UL>, (utest::v1::case_teardown_handler_t) case_teardown_sync_on_reset),
|
test_init<500UL>, (utest::v1::case_teardown_handler_t) case_teardown_sync_on_reset),
|
||||||
Case("Init, max_timeout", (utest::v1::case_setup_handler_t) case_setup_sync_on_reset,
|
Case("Init, max_timeout", (utest::v1::case_setup_handler_t) case_setup_sync_on_reset,
|
||||||
|
|
Loading…
Reference in New Issue