Skip to content

[skip changelog] Fix integration tests on OS X #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 1, 2021
Merged

[skip changelog] Fix integration tests on OS X #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e46a8a
[skip changelog] Skip boards without FQBN in tests
silvanocerza Sep 1, 2021
62bc36e
[skip changelog] Fix esp32 integration test on darwin
silvanocerza Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion test/test_compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
4 changes: 2 additions & 2 deletions test/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/test_upload_mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down