From 5e46a8a278d3f96623c7d797214aa6f1cfa1c1c5 Mon Sep 17 00:00:00 2001 From: Silvano Cerza Date: Wed, 1 Sep 2021 10:51:36 +0200 Subject: [PATCH 1/2] [skip changelog] Skip boards without FQBN in tests --- test/conftest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/conftest.py b/test/conftest.py index 0379d999ca0..46acf133827 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -204,7 +204,9 @@ def detected_boards(run_command): detected_boards = [] for port in json.loads(result.stdout): for board in port.get("boards", []): - fqbn = board.get("fqbn") + fqbn = board.get("FQBN") + if not fqbn: + continue package, architecture, _id = fqbn.split(":") detected_boards.append( Board( From 62bc36e75c5dfd9a48f77903187b09e4ee94b122 Mon Sep 17 00:00:00 2001 From: Silvano Cerza Date: Wed, 1 Sep 2021 10:56:39 +0200 Subject: [PATCH 2/2] [skip changelog] Fix esp32 integration test on darwin --- test/test_compile.py | 2 +- test/test_core.py | 4 ++-- test/test_upload_mock.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_compile.py b/test/test_compile.py index 47c7bf70fae..e11394516c4 100644 --- a/test/test_compile.py +++ b/test/test_compile.py @@ -1066,7 +1066,7 @@ def test_compile_with_esp32_bundled_libraries(run_command, data_dir, copy_sketch assert run_command("update") # Update index with esp32 core and install it - url = "https://dl.espressif.com/dl/package_esp32_index.json" + url = "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json" core_version = "1.0.6" assert run_command(f"core update-index --additional-urls={url}") assert run_command(f"core install esp32:esp32@{core_version} --additional-urls={url}") diff --git a/test/test_core.py b/test/test_core.py index 9f43d023f9a..9cc85a6bc24 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -210,10 +210,10 @@ def test_core_install_without_updateindex(run_command): ) def test_core_install_esp32(run_command, data_dir): # update index - url = "https://dl.espressif.com/dl/package_esp32_index.json" + url = "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json" assert run_command(f"core update-index --additional-urls={url}") # install 3rd-party core - assert run_command(f"core install esp32:esp32@1.0.4 --additional-urls={url}") + assert run_command(f"core install esp32:esp32@2.0.0 --additional-urls={url}") # create a sketch and compile to double check the core was successfully installed sketch_name = "test_core_install_esp32" sketch_path = os.path.join(data_dir, sketch_name) diff --git a/test/test_upload_mock.py b/test/test_upload_mock.py index 3c3a6c0a3c7..86cb93f36a9 100644 --- a/test/test_upload_mock.py +++ b/test/test_upload_mock.py @@ -29,7 +29,7 @@ def generate_build_dir(sketch_path): indexes = [ "https://adafruit.github.io/arduino-board-index/package_adafruit_index.json", - "https://dl.espressif.com/dl/package_esp32_index.json", + "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json", "http://arduino.esp8266.com/stable/package_esp8266com_index.json", "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/generic/package_spresense_index.json", ] pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy