Skip to content

Commit

Permalink
Merge branch 'ci/ignore_c6_restart_test_fail' into 'master'
Browse files Browse the repository at this point in the history
Ci/ignore c6 restart test fail

Closes IDFCI-2084, IDFCI-2085, and IDFCI-2024

See merge request espressif/esp-idf!29635
  • Loading branch information
Icarus113 committed Mar 14, 2024
2 parents 6b14ba5 + 03a6347 commit c539b7c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion components/esp_adc/test_apps/adc/main/test_adc_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ TEST_CASE("ADC continuous flush internal pool", "[adc_continuous][mannual][ignor
#define ADC_RESTART_TEST_SIZE 4096
#define ADC_READ_TEST_COUNT 100

TEST_CASE("ADC continuous test after restarting", "[adc_continuous]")
TEST_CASE("ADC continuous test after restarting", "[adc_continuous][ignore]")
{
adc_continuous_handle_t handle = NULL;
adc_continuous_handle_cfg_t adc_config = {
Expand Down
9 changes: 4 additions & 5 deletions components/esp_adc/test_apps/adc/pytest_adc.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
# SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: CC0-1.0

import pytest
from pytest_embedded import Dut

Expand All @@ -18,7 +17,7 @@
'pm_enable'
], indirect=True)
def test_adc(dut: Dut) -> None:
dut.run_all_single_board_cases(timeout=120)
dut.run_all_single_board_cases(timeout=120, reset=True)


# No PM test, as C2 doesn't support ADC continuous mode
Expand All @@ -34,7 +33,7 @@ def test_adc(dut: Dut) -> None:
indirect=True,
)
def test_adc_esp32c2_xtal_26mhz(dut: Dut) -> None:
dut.run_all_single_board_cases(timeout=120)
dut.run_all_single_board_cases(timeout=120, reset=True)


@pytest.mark.esp32s3
Expand All @@ -46,4 +45,4 @@ def test_adc_esp32c2_xtal_26mhz(dut: Dut) -> None:
'gdma_iram_safe',
], indirect=True)
def test_adc_gdma_iram(dut: Dut) -> None:
dut.run_all_single_board_cases(timeout=120)
dut.run_all_single_board_cases(timeout=120, reset=True)

0 comments on commit c539b7c

Please sign in to comment.