Skip to content

Commit ca1b0ef

Browse files
committed
[skip changelog] Fix integration tests on OS X (#1426)
* [skip changelog] Skip boards without FQBN in tests * [skip changelog] Fix esp32 integration test on darwin
1 parent 4d5a472 commit ca1b0ef

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

Diff for: test/conftest.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,9 @@ def detected_boards(run_command):
204204
detected_boards = []
205205
for port in json.loads(result.stdout):
206206
for board in port.get("boards", []):
207-
fqbn = board.get("fqbn")
207+
fqbn = board.get("FQBN")
208+
if not fqbn:
209+
continue
208210
package, architecture, _id = fqbn.split(":")
209211
detected_boards.append(
210212
Board(

Diff for: test/test_compile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ def test_compile_with_esp32_bundled_libraries(run_command, data_dir, copy_sketch
10661066
assert run_command("update")
10671067

10681068
# Update index with esp32 core and install it
1069-
url = "https://dl.espressif.com/dl/package_esp32_index.json"
1069+
url = "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json"
10701070
core_version = "1.0.6"
10711071
assert run_command(f"core update-index --additional-urls={url}")
10721072
assert run_command(f"core install esp32:esp32@{core_version} --additional-urls={url}")

Diff for: test/test_core.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,10 @@ def test_core_install_without_updateindex(run_command):
210210
)
211211
def test_core_install_esp32(run_command, data_dir):
212212
# update index
213-
url = "https://dl.espressif.com/dl/package_esp32_index.json"
213+
url = "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json"
214214
assert run_command(f"core update-index --additional-urls={url}")
215215
# install 3rd-party core
216-
assert run_command(f"core install esp32:esp32@1.0.4 --additional-urls={url}")
216+
assert run_command(f"core install esp32:esp32@2.0.0 --additional-urls={url}")
217217
# create a sketch and compile to double check the core was successfully installed
218218
sketch_name = "test_core_install_esp32"
219219
sketch_path = os.path.join(data_dir, sketch_name)

Diff for: test/test_upload_mock.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def generate_build_dir(sketch_path):
2929

3030
indexes = [
3131
"https://adafruit.github.io/arduino-board-index/package_adafruit_index.json",
32-
"https://dl.espressif.com/dl/package_esp32_index.json",
32+
"https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json",
3333
"http://arduino.esp8266.com/stable/package_esp8266com_index.json",
3434
"https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/generic/package_spresense_index.json",
3535
]

0 commit comments

Comments
 (0)