Skip to content

Commit 382581a

Browse files
committed
Do not perform drivers install during integration tests
1 parent 7604e85 commit 382581a

7 files changed

+24
-24
lines changed

Diff for: test/test_board.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ def test_board_details(run_command):
396396
result = run_command("core update-index")
397397
assert result.ok
398398
# Download samd core pinned to 1.8.6
399-
result = run_command("core install arduino:[email protected]")
399+
result = run_command("core install --skip-post-install arduino:[email protected]")
400400
assert result.ok
401401
result = run_command("board details arduino:samd:nano_33_iot --format json")
402402
assert result.ok

Diff for: test/test_compile.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def test_compile_without_fqbn(run_command):
2727
assert result.ok
2828

2929
# Install Arduino AVR Boards
30-
result = run_command("core install arduino:[email protected]")
30+
result = run_command("core install --skip-post-install arduino:[email protected]")
3131
assert result.ok
3232

3333
# Build sketch without FQBN
@@ -41,7 +41,7 @@ def test_compile_with_simple_sketch(run_command, data_dir, working_dir):
4141
assert result.ok
4242

4343
# Download latest AVR
44-
result = run_command("core install arduino:avr")
44+
result = run_command("core install --skip-post-install arduino:avr")
4545
assert result.ok
4646

4747
sketch_name = "CompileIntegrationTest"
@@ -93,7 +93,7 @@ def test_output_flag_default_path(run_command, data_dir, working_dir):
9393
assert result.ok
9494

9595
# Install Arduino AVR Boards
96-
result = run_command("core install arduino:[email protected]")
96+
result = run_command("core install --skip-post-install arduino:[email protected]")
9797
assert result.ok
9898

9999
# Create a test sketch
@@ -115,7 +115,7 @@ def test_compile_with_sketch_with_symlink_selfloop(run_command, data_dir):
115115
assert result.ok
116116

117117
# Install Arduino AVR Boards
118-
result = run_command("core install arduino:[email protected]")
118+
result = run_command("core install --skip-post-install arduino:[email protected]")
119119
assert result.ok
120120

121121
sketch_name = "CompileIntegrationTestSymlinkSelfLoop"
@@ -168,8 +168,8 @@ def test_compile_and_upload_combo(run_command, data_dir, detected_boards):
168168
assert result.ok
169169

170170
# Install required core(s)
171-
result = run_command("core install arduino:[email protected]")
172-
result = run_command("core install arduino:[email protected]")
171+
result = run_command("core install --skip-post-install arduino:[email protected]")
172+
result = run_command("core install --skip-post-install arduino:[email protected]")
173173
assert result.ok
174174

175175
# Create a test sketch
@@ -229,7 +229,7 @@ def test_compile_blacklisted_sketchname(run_command, data_dir):
229229
assert result.ok
230230

231231
# Install Arduino AVR Boards
232-
result = run_command("core install arduino:[email protected]")
232+
result = run_command("core install --skip-post-install arduino:[email protected]")
233233
assert result.ok
234234

235235
sketch_name = "RCS"
@@ -253,11 +253,11 @@ def test_compile_without_precompiled_libraries(run_command, data_dir):
253253
assert result.ok
254254
# arduino:mbed 1.1.5 is incompatible with the Arduino_TensorFlowLite library
255255
# see: https://github.com/arduino/ArduinoCore-nRF528x-mbedos/issues/93
256-
result = run_command("core install arduino:[email protected] --additional-urls={}".format(url))
256+
result = run_command("core install --skip-post-install arduino:[email protected] --additional-urls={}".format(url))
257257
assert result.ok
258-
result = run_command("core install arduino:[email protected] --additional-urls={}".format(url))
258+
result = run_command("core install --skip-post-install arduino:[email protected] --additional-urls={}".format(url))
259259
assert result.ok
260-
result = run_command("core install adafruit:[email protected] --additional-urls={}".format(url))
260+
result = run_command("core install --skip-post-install adafruit:[email protected] --additional-urls={}".format(url))
261261
assert result.ok
262262

263263
# Install pre-release version of Arduino_TensorFlowLite (will be officially released

Diff for: test/test_core.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_core_search_no_args(run_command):
4949
# update custom index and install test core (installed cores affect `core search`)
5050
url = "https://raw.githubusercontent.com/arduino/arduino-cli/master/test/testdata/test_index.json"
5151
assert run_command("core update-index --additional-urls={}".format(url))
52-
assert run_command("core install test:x86 --additional-urls={}".format(url))
52+
assert run_command("core install test:x86 --skip-post-install --additional-urls={}".format(url))
5353

5454
# list all with no additional urls, ensure the test core won't show up
5555
result = run_command("core search")
@@ -107,7 +107,7 @@ def test_core_install_esp32(run_command, data_dir):
107107
url = "https://dl.espressif.com/dl/package_esp32_index.json"
108108
assert run_command("core update-index --additional-urls={}".format(url))
109109
# install 3rd-party core
110-
assert run_command("core install esp32:[email protected] --additional-urls={}".format(url))
110+
assert run_command("core install esp32:[email protected] --skip-post-install --additional-urls={}".format(url))
111111
# create a sketch and compile to double check the core was successfully installed
112112
sketch_path = os.path.join(data_dir, "test_core_install_esp32")
113113
assert run_command("sketch new {}".format(sketch_path))
@@ -149,13 +149,13 @@ def test_core_install(run_command):
149149
assert run_command("core update-index")
150150

151151
# Install a specific core version
152-
assert run_command("core install arduino:[email protected]")
152+
assert run_command("core install --skip-post-install arduino:[email protected]")
153153
result = run_command("core list --format json")
154154
assert result.ok
155155
assert _in(result.stdout, "arduino:avr", "1.6.16")
156156

157157
# Replace it with a more recent one
158-
assert run_command("core install arduino:[email protected]")
158+
assert run_command("core install --skip-post-install arduino:[email protected]")
159159
result = run_command("core list --format json")
160160
assert result.ok
161161
assert _in(result.stdout, "arduino:avr", "1.6.17")
@@ -178,7 +178,7 @@ def test_core_install(run_command):
178178

179179
def test_core_uninstall(run_command):
180180
assert run_command("core update-index")
181-
assert run_command("core install arduino:avr")
181+
assert run_command("core install --skip-post-install arduino:avr")
182182
result = run_command("core list --format json")
183183
assert result.ok
184184
assert _in(result.stdout, "arduino:avr")

Diff for: test/test_outdated.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ def test_outdated(run_command):
2020
assert run_command("lib update-index")
2121

2222
# Installs an outdated core and library
23-
assert run_command("core install arduino:[email protected]")
23+
assert run_command("core install --skip-post-install arduino:[email protected]")
2424
assert run_command("lib install [email protected]")
2525

2626
# Installs latest version of a core and a library
27-
assert run_command("core install arduino:samd")
27+
assert run_command("core install --skip-post-install arduino:samd")
2828
assert run_command("lib install ArduinoJson")
2929

3030
# Verifies only outdated cores and libraries are returned

Diff for: test/test_update.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ def test_update_showing_outdated(run_command):
3030
assert run_command("lib update-index")
3131

3232
# Installs an outdated core and library
33-
assert run_command("core install arduino:[email protected]")
33+
assert run_command("core install --skip-post-install arduino:[email protected]")
3434
assert run_command("lib install [email protected]")
3535

3636
# Installs latest version of a core and a library
37-
assert run_command("core install arduino:samd")
37+
assert run_command("core install --skip-post-install arduino:samd")
3838
assert run_command("lib install ArduinoJson")
3939

4040
# Verifies outdated cores and libraries are printed after updating indexes

Diff for: test/test_upgrade.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ def test_upgrade(run_command):
2020
assert run_command("lib update-index")
2121

2222
# Installs an outdated core and library
23-
assert run_command("core install arduino:[email protected]")
23+
assert run_command("core install arduino:[email protected] --skip-post-install")
2424
assert run_command("lib install [email protected]")
2525

2626
# Installs latest version of a core and a library
27-
assert run_command("core install arduino:samd")
27+
assert run_command("core install arduino:samd --skip-post-install")
2828
assert run_command("lib install ArduinoJson")
2929

3030
# Verifies outdated core and libraries are shown

Diff for: test/test_upload.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test_upload(run_command, data_dir, detected_boards):
2828

2929
for board in detected_boards:
3030
# Download core
31-
assert run_command("core install {}".format(board.core))
31+
assert run_command("core install --skip-post-install {}".format(board.core))
3232
# Create a sketch
3333
sketch_path = os.path.join(data_dir, "foo")
3434
assert run_command("sketch new {}".format(sketch_path))
@@ -51,7 +51,7 @@ def test_upload_after_attach(run_command, data_dir, detected_boards):
5151

5252
for board in detected_boards:
5353
# Download core
54-
assert run_command("core install {}".format(board.core))
54+
assert run_command("core install --skip-post-install {}".format(board.core))
5555
# Create a sketch
5656
sketch_path = os.path.join(data_dir, "foo")
5757
assert run_command("sketch new {}".format(sketch_path))

0 commit comments

Comments
 (0)