alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'ci/optimize_test_wifi_get_started' into 'master'

Browse Source 
CI: optimize wifi get started example test

See merge request espressif/esp-idf!20585
This commit is contained in:
Jiang Jiang Jian 2022-10-14 15:50:13 +08:00
commit 1c84cfde14
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab/ci/target-test.yml
View File

@ -199,13 +199,13 @@ example_test_pytest_esp32_flash_encryption:
- build_pytest_examples_esp32 - build_pytest_examples_esp32
tags: [ esp32, flash_encryption ] tags: [ esp32, flash_encryption ]
example_test_pytest_esp32_multi_dut_generic: example_test_pytest_esp32_wifi_two_dut:
extends: extends:
- .pytest_examples_dir_template - .pytest_examples_dir_template
- .rules:test:example_test-esp32 - .rules:test:example_test-esp32-wifi
needs: needs:
- build_pytest_examples_esp32 - build_pytest_examples_esp32
tags: [ esp32, multi_dut_generic ] tags: [ esp32, wifi_two_dut ]
example_test_pytest_esp32c3_flash_encryption: example_test_pytest_esp32c3_flash_encryption:
extends: extends:

10
examples/wifi/getting_started/pytest_wifi_getting_started.py
View File

@ -22,7 +22,7 @@ from pytest_embedded_idf.dut import IdfDut
@pytest.mark.esp32 @pytest.mark.esp32
@pytest.mark.multi_dut_generic @pytest.mark.wifi_two_dut
@pytest.mark.parametrize( @pytest.mark.parametrize(
'count, app_path', [ 'count, app_path', [
(2, (2,
@ -33,10 +33,12 @@ def test_wifi_getting_started(dut: Tuple[IdfDut, IdfDut]) -> None:
softap = dut[0] softap = dut[0]
station = dut[1] station = dut[1]
ssid = 'myssid' ssid = softap.app.sdkconfig.get('ESP_WIFI_SSID')
password = 'mypassword' password = softap.app.sdkconfig.get('ESP_WIFI_PASSWORD')
tag = 'wifi station' assert station.app.sdkconfig.get('ESP_WIFI_SSID') == ssid
assert station.app.sdkconfig.get('ESP_WIFI_PASSWORD') == password
tag = 'wifi station'
station.expect(f'{tag}: got ip:', timeout=60) station.expect(f'{tag}: got ip:', timeout=60)
station.expect(f'{tag}: connected to ap SSID:{ssid} password:{password}', timeout=60) station.expect(f'{tag}: connected to ap SSID:{ssid} password:{password}', timeout=60)
softap.expect('station .+ join, AID=', timeout=60) softap.expect('station .+ join, AID=', timeout=60)

2
examples/wifi/getting_started/softAP/sdkconfig.ci Normal file
View File

@ -0,0 +1,2 @@
CONFIG_ESP_WIFI_SSID="ssid_${IDF_TARGET}_${CI_PIPELINE_ID}"
CONFIG_ESP_WIFI_PASSWORD="password_${IDF_TARGET}_${CI_PIPELINE_ID}"

2
examples/wifi/getting_started/station/sdkconfig.ci Normal file
View File

@ -0,0 +1,2 @@
CONFIG_ESP_WIFI_SSID="ssid_${IDF_TARGET}_${CI_PIPELINE_ID}"
CONFIG_ESP_WIFI_PASSWORD="password_${IDF_TARGET}_${CI_PIPELINE_ID}"

2
pytest.ini
View File

@ -66,7 +66,7 @@ markers =
# multi-dut markers # multi-dut markers
i154_multi_dut: tests should be used for i154, such as openthread. i154_multi_dut: tests should be used for i154, such as openthread.
multi_dut_generic: tests should be run on generic runners, at least have two duts connected. wifi_two_dut: tests should be run on runners which has two wifi duts connected.
generic_multi_device: generic multiple devices whose corresponding gpio pins are connected to each other. generic_multi_device: generic multiple devices whose corresponding gpio pins are connected to each other.
# host_test markers # host_test markers