Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6ec7f38

Browse files
committedDec 13, 2022
Migrate TestInstallZipInvalidLibrary from test_lib.py to lib_test.go
1 parent 76d3dd3 commit 6ec7f38

File tree

4 files changed

+33
-31
lines changed

4 files changed

+33
-31
lines changed
 

‎internal/integrationtest/lib/lib_test.go

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,3 +1138,36 @@ func TestInstallZipLibWithMacosMetadata(t *testing.T) {
11381138
require.FileExists(t, libInstallDir.Join("library.properties").String())
11391139
require.FileExists(t, libInstallDir.Join("src", "fake-lib.h").String())
11401140
}
1141+
1142+
func TestInstallZipInvalidLibrary(t *testing.T) {
1143+
env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
1144+
defer env.CleanUp()
1145+
1146+
// Initialize configs to enable --zip-path flag
1147+
envVar := cli.GetDefaultEnv()
1148+
envVar["ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL"] = "true"
1149+
_, _, err := cli.RunWithCustomEnv(envVar, "config", "init", "--dest-dir", ".")
1150+
require.NoError(t, err)
1151+
1152+
libInstallDir := cli.SketchbookDir().Join("libraries", "lib-without-header")
1153+
// Verifies library is not already installed
1154+
require.NoDirExists(t, libInstallDir.String())
1155+
1156+
wd, err := paths.Getwd()
1157+
require.NoError(t, err)
1158+
zipPath := wd.Parent().Join("testdata", "lib-without-header.zip")
1159+
// Test zip-path install
1160+
_, stderr, err := cli.Run("lib", "install", "--zip-path", zipPath.String())
1161+
require.Error(t, err)
1162+
require.Contains(t, string(stderr), "library not valid")
1163+
1164+
libInstallDir = cli.SketchbookDir().Join("libraries", "lib-without-properties")
1165+
// Verifies library is not already installed
1166+
require.NoDirExists(t, libInstallDir.String())
1167+
1168+
zipPath = wd.Parent().Join("testdata", "lib-without-properties.zip")
1169+
// Test zip-path install
1170+
_, stderr, err = cli.Run("lib", "install", "--zip-path", zipPath.String())
1171+
require.Error(t, err)
1172+
require.Contains(t, string(stderr), "library not valid")
1173+
}

‎test/test_lib.py

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -206,37 +206,6 @@ def test_install_with_zip_path_multiple_libraries(run_command, downloads_dir, da
206206
assert ble_install_dir.exists()
207207

208208

209-
def test_install_zip_invalid_library(run_command, data_dir, downloads_dir):
210-
# Initialize configs to enable --zip-path flag
211-
env = {
212-
"ARDUINO_DATA_DIR": data_dir,
213-
"ARDUINO_DOWNLOADS_DIR": downloads_dir,
214-
"ARDUINO_SKETCHBOOK_DIR": data_dir,
215-
"ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL": "true",
216-
}
217-
assert run_command(["config", "init", "--dest-dir", "."], custom_env=env)
218-
219-
lib_install_dir = Path(data_dir, "libraries", "lib-without-header")
220-
# Verifies library is not already installed
221-
assert not lib_install_dir.exists()
222-
223-
zip_path = Path(__file__).parent / "testdata" / "lib-without-header.zip"
224-
# Test zip-path install
225-
res = run_command(["lib", "install", "--zip-path", zip_path])
226-
assert res.failed
227-
assert "library not valid" in res.stderr
228-
229-
lib_install_dir = Path(data_dir, "libraries", "lib-without-properties")
230-
# Verifies library is not already installed
231-
assert not lib_install_dir.exists()
232-
233-
zip_path = Path(__file__).parent / "testdata" / "lib-without-properties.zip"
234-
# Test zip-path install
235-
res = run_command(["lib", "install", "--zip-path", zip_path])
236-
assert res.failed
237-
assert "library not valid" in res.stderr
238-
239-
240209
def test_install_git_invalid_library(run_command, data_dir, downloads_dir):
241210
# Initialize configs to enable --zip-path flag
242211
env = {

0 commit comments

Comments
 (0)
Please sign in to comment.