Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/update_can_target_test_backport_v3.3' into 'release/v3.3'

Browse source 
CAN: Reenable example tests (backport v3.3)

See merge request espressif/esp-idf!6735
This commit is contained in:
Angus Gratton 2019-12-20 13:03:20 +08:00
commit e395d14c59
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -975,11 +975,17 @@ example_test_002:
- ESP32 - ESP32
- Example_SDIO - Example_SDIO
example_test_004: example_test_004A:
<<: *example_test_template <<: *example_test_template
tags: tags:
- ESP32 - ESP32
- Example_CAN - Example_CAN1
example_test_004B:
<<: *example_test_template
tags:
- ESP32
- Example_CAN2
example_test_005: example_test_005:
<<: *example_test_template <<: *example_test_template

4
examples/peripherals/can/can_alert_and_recovery/example_test.py
View file

@ -19,9 +19,9 @@ STR_EXPECT = ("CAN Alert and Recovery: Driver installed", "CAN Alert and Recover
EXPECT_TIMEOUT = 20 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): 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 = env.get_dut('dut1', 'examples/peripherals/can/can_alert_and_recovery')
dut.start_app() dut.start_app()

2
examples/peripherals/can/can_network/example_test.py
View file

@ -36,7 +36,7 @@ def dut_thread_callback(**kwargs):
result[0] = True 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): def test_can_network_example(env, extra_data):
# Get device under test. "dut1", "dut2", and "dut3" must be properly defined in EnvConfig # Get device under test. "dut1", "dut2", and "dut3" must be properly defined in EnvConfig

4
examples/peripherals/can/can_self_test/example_test.py
View file

@ -19,9 +19,9 @@ STR_EXPECT = ("CAN Self Test: Driver installed", "CAN Self Test: Driver uninstal
EXPECT_TIMEOUT = 20 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): 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 = env.get_dut('dut1', 'examples/peripherals/can/can_self_test')
dut.start_app() dut.start_app()