Fix watchdog reset test #11773

fkjagodzinski · 2019-10-30T12:38:22Z

Description (required)

Summary of change (What the change is for and why)

I fixed the Watchdog reset tests (both HAL & drier) with the following:

Added a watchdog-kicking thread, running in the background when the test suite is handling a failed assertion. This is to make sure all failures are processed correctly by greentea. This is especially important in case the watchdog reset is late and happens when the test suite teardown is doing its job.
Fixed the LP ticker macro in the test, so the deepsleep test case is actually executed.
Replaced deprecated API calls for wait/sleep with the current ones.
Updated the Watchdog timing requirements for the deepsleep mode according to findings from K64F: watchdog timeout doubled in deeplseep #11774 -- allow doubled timeout for this mode.

Also fixed the hal_watchdog_init() for K64F -- enabled the Watchdog for Debug and Stop modes, as required by https://github.com/ARMmbed/mbed-os-5-docs/blob/development/docs/porting/target/Watchdog.md#defined-behavior.

Documentation (Details of any document updates required)

Pull request type (required)

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results (required)

[] No Tests required for this change (E.g docs only update)
[x] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers (optional)

@0xc0170, @jamesbeyond

Release Notes (required for feature/major PRs)

Summary of changes

Impact of changes

Migration actions required

Add a watchdog-kicking thread running in the background when the test suite is handling a failed assertion. A single watchdog kick did not provide enough time for the greentea communication if the watchdog reset happened later than expected.

Replace the wait_ms() with wait_us(). Replace the Semaphore::wait() with Semaphore::acquire().

Wait for the serial buffers flush before starting the watchdog.

Use ThisThread::sleep_for() for sleeping instead of the calls to Semaphore::acquire().

ciarmcom · 2019-10-30T14:00:32Z

@fkjagodzinski, thank you for your changes.
@jamesbeyond @0xc0170 @ARMmbed/mbed-os-core @ARMmbed/mbed-os-test @ARMmbed/mbed-os-hal @ARMmbed/mbed-os-maintainers please review.

TESTS/mbed_drivers/watchdog_reset/main.cpp

Enable the Watchdog Timer for the low-power stop modes of operation, including the VLPS used in deepsleep. Enable the Watchdog Timer for the Debug mode.

fkjagodzinski · 2019-11-05T10:38:08Z

I think this PR is complete now; ready for review. The recent update fixes the K64F Watchdog mode settings (enables the Watchdog for Debug and Stop modes) and extends the deepsleep wait time according to findings from #11774.

Extend the deepsleep wait up to 220% of the Watchdog timeout. One of the current Watchdog timing requirements is to fire BEFORE twice the timeout value, but at least one target (K64F) is expected to fire EXACTLY at a doubled timeout value in deepsleep mode. This patch updates the test to cope with a new deepsleep timing requirement.

fkjagodzinski · 2019-11-05T12:14:13Z

Docs update in ARMmbed/mbed-os-5-docs#1155 (ARMmbed/mbed-os-5-docs@db2d2d5).

0xc0170 · 2019-11-13T17:18:13Z

I started CI , will review soon

mbed-ci · 2019-11-13T21:17:11Z

Test run: FAILED

Summary: 1 of 11 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_greentea-test

fkjagodzinski · 2019-11-14T09:25:05Z

I can see one failed test case:
features-storage-tests-kvstore-general_tests_phase_1 | TDB_set_key_init_deinit.
Doesn't look related to this patch.

0xc0170 · 2019-11-14T10:48:48Z

Test failed because of #11862, we will investigate

0xc0170 · 2019-11-15T17:53:25Z

CI restarted

mbed-ci · 2019-11-15T19:47:42Z

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 2
Build artifacts

mprse

Well done 👍

fkjagodzinski · 2019-11-22T12:33:32Z

@jamesbeyond could you review please?

0xc0170 · 2019-11-22T13:30:01Z

I'll rerun CI in the meantime to get an update

0xc0170 · 2019-11-22T13:30:30Z

@jamesbeyond If approved within today, will be in 5.15 (marked as such).

mbed-ci · 2019-11-22T14:33:23Z

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 3
Build artifacts

jamesbeyond

I am happy about the changes

Filip Jagodzinski added 5 commits October 30, 2019 12:51

Test: Watchdog: Fix error handling

7af11fa

Add a watchdog-kicking thread running in the background when the test suite is handling a failed assertion. A single watchdog kick did not provide enough time for the greentea communication if the watchdog reset happened later than expected.

Test: Watchdog: Fix LP ticker preproc condition

2410257

Test: Watchdog: Update the deprecated calls

e3f8711

Replace the wait_ms() with wait_us(). Replace the Semaphore::wait() with Semaphore::acquire().

Test: Watchdog: Fix deepsleep wait

361804b

Wait for the serial buffers flush before starting the watchdog.

Test: Watchdog: Update the sleep & deepsleep cases

8640da4

Use ThisThread::sleep_for() for sleeping instead of the calls to Semaphore::acquire().

fkjagodzinski mentioned this pull request Oct 30, 2019

K64F: watchdog timeout doubled in deeplseep #11774

Closed

ciarmcom requested review from 0xc0170, jamesbeyond and a team October 30, 2019 14:00

ciarmcom added the needs: review label Oct 30, 2019

fkjagodzinski commented Oct 31, 2019

View reviewed changes

TESTS/mbed_drivers/watchdog_reset/main.cpp Outdated Show resolved Hide resolved

K64F: Fix the watchdog mode settings

945a9b3

Enable the Watchdog Timer for the low-power stop modes of operation, including the VLPS used in deepsleep. Enable the Watchdog Timer for the Debug mode.

fkjagodzinski force-pushed the fix-watchdog_reset_test branch from 6529d4a to 55e1a76 Compare November 5, 2019 10:50

0xc0170 removed request for a team November 14, 2019 14:00

0xc0170 approved these changes Nov 14, 2019

View reviewed changes

mprse approved these changes Nov 18, 2019

View reviewed changes

0xc0170 added the release-version: 5.15.0-rc1 label Nov 22, 2019

jamesbeyond approved these changes Nov 22, 2019

View reviewed changes

0xc0170 removed the needs: review label Nov 22, 2019

0xc0170 merged commit 83fc580 into ARMmbed:master Nov 22, 2019

fkjagodzinski deleted the fix-watchdog_reset_test branch November 25, 2019 08:26

fkjagodzinski mentioned this pull request Nov 25, 2019

Update the watchdog timing requirements ARMmbed/mbed-os-5-docs#1155

Merged

evedon mentioned this pull request Nov 28, 2019

Bare metal greentea tests compilation fixes #11979

Merged

Fix watchdog reset test #11773

Fix watchdog reset test #11773

Uh oh!

Conversation

fkjagodzinski commented Oct 30, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description (required)

Summary of change (What the change is for and why)

Documentation (Details of any document updates required)

Pull request type (required)

Test results (required)

Reviewers (optional)

Release Notes (required for feature/major PRs)

Summary of changes

Impact of changes

Migration actions required

Uh oh!

ciarmcom commented Oct 30, 2019

Uh oh!

Uh oh!

fkjagodzinski commented Nov 5, 2019

Uh oh!

fkjagodzinski commented Nov 5, 2019

Uh oh!

0xc0170 commented Nov 13, 2019

Uh oh!

mbed-ci commented Nov 13, 2019

Test run: FAILED

Uh oh!

fkjagodzinski commented Nov 14, 2019

Uh oh!

0xc0170 commented Nov 14, 2019

Uh oh!

0xc0170 commented Nov 15, 2019

Uh oh!

mbed-ci commented Nov 15, 2019

Test run: SUCCESS

Uh oh!

mprse left a comment

Choose a reason for hiding this comment

Uh oh!

fkjagodzinski commented Nov 22, 2019

Uh oh!

0xc0170 commented Nov 22, 2019

Uh oh!

0xc0170 commented Nov 22, 2019

Uh oh!

mbed-ci commented Nov 22, 2019

Test run: SUCCESS

Uh oh!

jamesbeyond left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

fkjagodzinski commented Oct 30, 2019 •

edited

Loading