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

Merge branch 'bugfix/ci_app_test_dependency' into 'master'

Browse source 
CI: correct example vs. custom tests dependency

See merge request espressif/esp-idf!8258
This commit is contained in:
Anton Maklakov 2020-04-09 14:02:13 +08:00
commit 445e847274
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/mqtt/weekend_test/mqtt_publish_test.py
View file

@ -113,7 +113,7 @@ def test_single_config(dut, transport, qos, repeat, published):
event_stop_client.clear() event_stop_client.clear()
@ttfw_idf.idf_example_test(env_tag="Example_WIFI") @ttfw_idf.idf_custom_test(env_tag="Example_WIFI")
def test_weekend_mqtt_publish(env, extra_data): def test_weekend_mqtt_publish(env, extra_data):
# Using broker url dictionary for different transport # Using broker url dictionary for different transport
global broker_host global broker_host
@ -127,7 +127,7 @@ def test_weekend_mqtt_publish(env, extra_data):
3. Test evaluates python client received correct qos0 message 3. Test evaluates python client received correct qos0 message
4. Test ESP32 client received correct qos0 message 4. Test ESP32 client received correct qos0 message
""" """
dut1 = env.get_dut("mqtt_publish_connect_test", "examples/protocols/mqtt/publish_connect_test") dut1 = env.get_dut("mqtt_publish_connect_test", "tools/test_apps/protocols/mqtt/publish_connect_test")
# Look for host:port in sdkconfig # Look for host:port in sdkconfig
try: try:
# python client subscribes to the topic to which esp client publishes and vice versa # python client subscribes to the topic to which esp client publishes and vice versa

1
tools/ci/config/build.yml
View file

@ -217,6 +217,7 @@ build_examples_cmake_esp32s2:
- $BOT_LABEL_BUILD - $BOT_LABEL_BUILD
- $BOT_LABEL_INTEGRATION_TEST - $BOT_LABEL_INTEGRATION_TEST
- $BOT_LABEL_REGULAR_TEST - $BOT_LABEL_REGULAR_TEST
- $BOT_LABEL_CUSTOM_TEST
- $BOT_LABEL_WEEKEND_TEST - $BOT_LABEL_WEEKEND_TEST
script: script:
- mkdir -p ${BUILD_PATH} - mkdir -p ${BUILD_PATH}

1
tools/ci/config/target-test.yml
View file

@ -98,7 +98,6 @@
variables: variables:
- $BOT_TRIGGER_WITH_LABEL == null - $BOT_TRIGGER_WITH_LABEL == null
- $BOT_LABEL_CUSTOM_TEST - $BOT_LABEL_CUSTOM_TEST
- $BOT_LABEL_EXAMPLE_TEST
variables: variables:
TEST_FW_PATH: "$CI_PROJECT_DIR/tools/tiny-test-fw" TEST_FW_PATH: "$CI_PROJECT_DIR/tools/tiny-test-fw"
TEST_CASE_PATH: "$CI_PROJECT_DIR/tools/test_apps" TEST_CASE_PATH: "$CI_PROJECT_DIR/tools/test_apps"

4
tools/test_apps/protocols/mqtt/publish_connect_test/app_test.py
View file

@ -131,7 +131,7 @@ class TlsServer:
@ttfw_idf.idf_custom_test(env_tag="Example_WIFI", group="test-apps") @ttfw_idf.idf_custom_test(env_tag="Example_WIFI", group="test-apps")
def test_examples_protocol_mqtt_publish_connect(env, extra_data): def test_app_protocol_mqtt_publish_connect(env, extra_data):
""" """
steps: steps:
1. join AP 1. join AP
@ -227,4 +227,4 @@ def test_examples_protocol_mqtt_publish_connect(env, extra_data):
if __name__ == '__main__': if __name__ == '__main__':
test_examples_protocol_mqtt_publish_connect() test_app_protocol_mqtt_publish_connect()