Преглед изворни кода

Merge branch 'bugfix/fix_typo_naming_of_flash_multi' into 'master'

ci: fix typos tag naming of all flash_multi

See merge request espressif/esp-idf!22181
Jiang Guang Ming пре 3 година
родитељ
комит
851c10aded

+ 4 - 4
.gitlab/ci/target-test.yml

@@ -504,7 +504,7 @@ component_ut_pytest_esp32_flash_multi:
     - .rules:test:component_ut-esp32
   needs:
     - build_pytest_components_esp32
-  tags: [ esp32, flash_mutli ]
+  tags: [ esp32, flash_multi ]
 
 component_ut_pytest_esp32_xtal32k:
   extends:
@@ -569,7 +569,7 @@ component_ut_pytest_esp32s2_flash_multi:
     - .rules:test:component_ut-esp32s2
   needs:
     - build_pytest_components_esp32s2
-  tags: [ esp32s2, flash_mutli ]
+  tags: [ esp32s2, flash_multi ]
 
 component_ut_pytest_esp32s3_generic:
   extends:
@@ -626,7 +626,7 @@ component_ut_pytest_esp32s3_flash_multi:
     - .rules:test:component_ut-esp32s3
   needs:
     - build_pytest_components_esp32s3
-  tags: [ esp32s3, flash_mutli ]
+  tags: [ esp32s3, flash_multi ]
 
 component_ut_pytest_esp32c2_generic:
   extends:
@@ -724,7 +724,7 @@ component_ut_pytest_esp32c3_flash_multi:
     - .rules:test:component_ut-esp32c3
   needs:
     - build_pytest_components_esp32c3
-  tags: [ esp32c3, flash_mutli ]
+  tags: [ esp32c3, flash_multi ]
 
 component_ut_pytest_esp32_sdmmc:
   extends:

+ 1 - 1
components/driver/test_apps/spi/master/pytest_spi_master.py

@@ -17,7 +17,7 @@ def test_master_single_dev(case_tester) -> None:       # type: ignore
 
 # Job for test_env `external_flash` just for esp32 only
 @pytest.mark.esp32
-@pytest.mark.flash_mutli
+@pytest.mark.flash_multi
 @pytest.mark.parametrize('config', ['defaults',], indirect=True)
 def test_master_esp_flash(case_tester) -> None:        # type: ignore
     for case in case_tester.test_menu:

+ 1 - 1
components/spi_flash/test_apps/esp_flash/pytest_esp_flash.py

@@ -47,7 +47,7 @@ def test_esp_flash_rom(dut: Dut) -> None:
 @pytest.mark.esp32s3
 @pytest.mark.esp32c3
 @pytest.mark.esp32c2
-@pytest.mark.flash_mutli
+@pytest.mark.flash_multi
 @pytest.mark.parametrize(
     'config',
     [

+ 1 - 1
conftest.py

@@ -91,7 +91,7 @@ ENV_MARKERS = {
     'flash_encryption': 'Flash Encryption runners',
     'flash_encryption_f4r8': 'Flash Encryption runners with 4-line flash and 8-line psram',
     'flash_encryption_f8r8': 'Flash Encryption runners with 8-line flash and 8-line psram',
-    'flash_mutli': 'Multiple flash chips tests',
+    'flash_multi': 'Multiple flash chips tests',
     'psram': 'Chip has 4-line psram',
     'ir_transceiver': 'runners with a pair of IR transmitter and receiver',
     'twai_transceiver': 'runners with a TWAI PHY transceiver',