From 49b2bf26567bc32c8c8b2b9af3a87ca87477f73c 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 --- .gitlab-ci.yml | 10 ++++++++-- .../can/can_alert_and_recovery/example_test.py | 4 ++-- examples/peripherals/can/can_network/example_test.py | 2 +- examples/peripherals/can/can_self_test/example_test.py | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d2a69444..64e2fa404 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -968,11 +968,17 @@ example_test_002_01: - ESP32 - Example_SDIO -example_test_004_01: +example_test_004A_01: <<: *example_test_template tags: - ESP32 - - Example_CAN + - Example_CAN1 + +example_test_004B_01: + <<: *example_test_template + tags: + - ESP32 + - Example_CAN2 example_test_005_01: <<: *example_test_template 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 dfd693cf6..7d96274c4 100644 --- a/examples/peripherals/can/can_alert_and_recovery/example_test.py +++ b/examples/peripherals/can/can_alert_and_recovery/example_test.py @@ -17,9 +17,9 @@ 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): - # 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_alert_and_recovery') dut.start_app() diff --git a/examples/peripherals/can/can_network/example_test.py b/examples/peripherals/can/can_network/example_test.py index 41ebae096..e56c37e78 100644 --- a/examples/peripherals/can/can_network/example_test.py +++ b/examples/peripherals/can/can_network/example_test.py @@ -34,7 +34,7 @@ def dut_thread_callback(**kwargs): #Mark thread has run to completion without any exceptions 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 13f1cb004..3d9beea87 100644 --- a/examples/peripherals/can/can_self_test/example_test.py +++ b/examples/peripherals/can/can_self_test/example_test.py @@ -17,9 +17,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.start_app()