From 81ddd9e2914d6c82fde080883969f58a8ae6217f Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Fri, 25 Oct 2019 14:10:06 +0800 Subject: [PATCH] CAN: Reenable example tests This commit updates the CAN example tests and updates the job and environment labels in the target-test.yml --- .../can/can_alert_and_recovery/example_test.py | 2 +- examples/peripherals/can/can_network/example_test.py | 2 +- examples/peripherals/can/can_self_test/example_test.py | 4 ++-- tools/ci/config/target-test.yml | 10 ++++++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/examples/peripherals/can/can_alert_and_recovery/example_test.py b/examples/peripherals/can/can_alert_and_recovery/example_test.py index 911cebb32f..77110053d4 100644 --- a/examples/peripherals/can/can_alert_and_recovery/example_test.py +++ b/examples/peripherals/can/can_alert_and_recovery/example_test.py @@ -20,7 +20,7 @@ STR_EXPECT = ("CAN Alert and Recovery: Driver installed", "CAN Alert and Recover EXPECT_TIMEOUT = 20 -@IDF.idf_example_test(env_tag='Example_CAN1', ignore=True) +@IDF.idf_example_test(env_tag='Example_CAN1') def test_can_alert_and_recovery_example(env, extra_data): dut = env.get_dut('dut1', 'examples/peripherals/can/can_alert_and_recovery', dut_class=ESP32DUT) dut.start_app() diff --git a/examples/peripherals/can/can_network/example_test.py b/examples/peripherals/can/can_network/example_test.py index 8c66f89f82..3183baa750 100644 --- a/examples/peripherals/can/can_network/example_test.py +++ b/examples/peripherals/can/can_network/example_test.py @@ -37,7 +37,7 @@ def dut_thread_callback(**kwargs): result[0] = True -@IDF.idf_example_test(env_tag='Example_CAN2', ignore=True) +@IDF.idf_example_test(env_tag='Example_CAN2') def test_can_network_example(env, extra_data): # Get device under test. "dut1", "dut2", and "dut3" must be properly defined in EnvConfig diff --git a/examples/peripherals/can/can_self_test/example_test.py b/examples/peripherals/can/can_self_test/example_test.py index 4cad759206..9a888643ca 100644 --- a/examples/peripherals/can/can_self_test/example_test.py +++ b/examples/peripherals/can/can_self_test/example_test.py @@ -20,9 +20,9 @@ STR_EXPECT = ("CAN Self Test: Driver installed", "CAN Self Test: Driver uninstal EXPECT_TIMEOUT = 20 -@IDF.idf_example_test(env_tag='Example_CAN1', ignore=True) +@IDF.idf_example_test(env_tag='Example_CAN1') def test_can_self_test_example(env, extra_data): - # Get device under test, flash and start example. "dut4" must be defined in EnvConfig + # Get device under test, flash and start example. "dut1" must be defined in EnvConfig dut = env.get_dut('dut1', 'examples/peripherals/can/can_self_test', dut_class=ESP32DUT) dut.start_app() diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index d7c4355c59..12192d1962 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -169,11 +169,17 @@ example_test_002: - ESP32 - Example_SDIO -example_test_004: +example_test_004A: extends: .example_test_template tags: - ESP32 - - Example_CAN + - Example_CAN1 + +example_test_004B: + extends: .example_test_template + tags: + - ESP32 + - Example_CAN2 example_test_005: extends: .example_test_template