Skip to content

Commit b8c41db

Browse files
committed
fix(tests): integration tests issues
1 parent 5841a0d commit b8c41db

File tree

8 files changed

+17
-12
lines changed

8 files changed

+17
-12
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.16)
22

33
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
44
project(main)

integration_tests/test_integration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def test_set_component_version(project):
138138
)
139139
def test_root_dep_failed(project):
140140
res = project_action(project, 'reconfigure')
141-
assert "ERROR: Because project depends on idf (^6.1) which doesn't match any" in res
141+
assert "Result: Because project depends on idf (^6.1) which doesn't match any" in res
142142
assert 'versions, version solving failed.' in res
143143
assert 'Please check manifest file of the following component(s): main,' in res
144144
assert 'component_foo' in res

integration_tests/test_override_path.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
1+
# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
22
# SPDX-License-Identifier: Apache-2.0
33
import os
44
import shutil
@@ -95,15 +95,15 @@ def test_reconfigure_with_override_path_not_a_folder(project):
9595
'components': {
9696
'main': {
9797
'dependencies': {
98-
'espressif/esp_rainmaker': {
99-
'version': '1.0.0',
98+
'espressif/esp_insights': {
99+
'version': '1.2.8',
100100
},
101101
}
102102
},
103103
'espressif__esp_schedule': {
104104
'dependencies': {
105105
'espressif/rmaker_common': {
106-
'version': '~1.4.2',
106+
'version': '~1.4.0',
107107
}
108108
},
109109
'version': '1.1.0',
@@ -130,7 +130,7 @@ def test_copy_paste_managed_components_then_override_within_other_components(pro
130130
"""
131131
dependencies:
132132
espressif/rmaker_common:
133-
version: ~1.4.2
133+
version: ~1.4.0
134134
override_path: "../espressif__rmaker_common"
135135
version: "1.1.0" # required to reproduce the bug, can't reproduce without "version"
136136
"""

tests/fixtures/components/cmp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.16)
22

33
set(COMPONENT_SRCDIRS .)
44
set(COMPONENT_ADD_INCLUDEDIRS "include")

tests/fixtures/components/cmp_for_examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.16)
22

33
set(COMPONENT_SRCDIRS .)
44
set(COMPONENT_ADD_INCLUDEDIRS "include")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.16)
22
project(ProjectName)
3-
idf_component_register(SRCS "cmp.c" INCLUDE_DIRS "include")
3+
idf_component_register(SRCS "cmp.c" INCLUDE_DIRS "include")
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cmake_minimum_required(VERSION 3.16)
2+
3+
set(COMPONENT_SRCDIRS .)
4+
5+
register_component()

tests/fixtures/components/pre/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.13)
1+
cmake_minimum_required(VERSION 3.16)
22

33
set(COMPONENT_SRCDIRS .)
44
set(COMPONENT_ADD_INCLUDEDIRS "include")

0 commit comments

Comments
 (0)