Skip to content

Commit 7b7941e

Browse files
committed
[skip changelog] Fix tests on Windows
1 parent 0ba26de commit 7b7941e

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

Diff for: test/test_compile.py

+8-12
Original file line numberDiff line numberDiff line change
@@ -1055,12 +1055,10 @@ def test_compile_with_esp32_bundled_libraries(run_command, data_dir, copy_sketch
10551055

10561056
core_bundled_lib_path = Path(data_dir, "packages", "esp32", "hardware", "esp32", core_version, "libraries", "SD")
10571057
cli_installed_lib_path = Path(data_dir, "libraries", "SD")
1058-
expected_output = [
1059-
'Multiple libraries were found for "SD.h"',
1060-
f" Used: {core_bundled_lib_path}",
1061-
f" Not used: {cli_installed_lib_path}",
1062-
]
1063-
assert "\n".join(expected_output) in res.stdout
1058+
assert 'Multiple libraries were found for "SD.h"' in res.stdout
1059+
assert f" Used: {core_bundled_lib_path}" in res.stdout
1060+
assert f" Not used: {cli_installed_lib_path}" in res.stdout
1061+
assert f"Using library SD at version 1.0.5 in folder: {core_bundled_lib_path}" in res.stdout
10641062

10651063

10661064
def test_compile_with_esp8266_bundled_libraries(run_command, data_dir, copy_sketch):
@@ -1096,9 +1094,7 @@ def test_compile_with_esp8266_bundled_libraries(run_command, data_dir, copy_sket
10961094
data_dir, "packages", "esp8266", "hardware", "esp8266", core_version, "libraries", "SD"
10971095
)
10981096
cli_installed_lib_path = Path(data_dir, "libraries", "SD")
1099-
expected_output = [
1100-
'Multiple libraries were found for "SD.h"',
1101-
f" Used: {core_bundled_lib_path}",
1102-
f" Not used: {cli_installed_lib_path}",
1103-
]
1104-
assert "\n".join(expected_output) in res.stdout
1097+
assert 'Multiple libraries were found for "SD.h"' in res.stdout
1098+
assert f" Used: {core_bundled_lib_path}" in res.stdout
1099+
assert f" Not used: {cli_installed_lib_path}" in res.stdout
1100+
assert f"Using library SD at version 2.0.0 in folder: {core_bundled_lib_path}" in res.stdout

0 commit comments

Comments
 (0)