From ed6b360047eaf04b9d08b724d16340cdb4c033cf Mon Sep 17 00:00:00 2001 From: MatteoPologruto Date: Wed, 21 Jun 2023 10:10:40 +0200 Subject: [PATCH 1/2] Fix failing board tests after package index updates --- internal/integrationtest/board/board_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/integrationtest/board/board_test.go b/internal/integrationtest/board/board_test.go index f2bc48dbeb1..804521566e0 100644 --- a/internal/integrationtest/board/board_test.go +++ b/internal/integrationtest/board/board_test.go @@ -405,7 +405,7 @@ func TestBoardSearch(t *testing.T) { // Verifies no board has FQBN set since no platform is installed requirejson.Query(t, stdout, "[ .[] | select(.fqbn) ] | length", "0") requirejson.Contains(t, stdout, `[ - {"name": "Arduino Uno"}, + {"name": "Arduino UNO"}, {"name": "Arduino Yún"}, {"name": "Arduino Zero"}, {"name": "Arduino Nano 33 BLE"}, From 25866410d6b98764eee9584b98e6d6482956e16f Mon Sep 17 00:00:00 2001 From: MatteoPologruto Date: Wed, 21 Jun 2023 10:28:32 +0200 Subject: [PATCH 2/2] Remove duplicate test --- internal/integrationtest/board/board_test.go | 24 -------------------- 1 file changed, 24 deletions(-) diff --git a/internal/integrationtest/board/board_test.go b/internal/integrationtest/board/board_test.go index 804521566e0..cf86506853e 100644 --- a/internal/integrationtest/board/board_test.go +++ b/internal/integrationtest/board/board_test.go @@ -124,30 +124,6 @@ func TestBoardListWithFqbnFilterInvalid(t *testing.T) { requirejson.Query(t, stderr, ".error", `"Invalid FQBN: not an FQBN: yadayada"`) } -func TestBoardListWithInvalidDiscovery(t *testing.T) { - env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t) - defer env.CleanUp() - - _, _, err := cli.Run("core", "update-index") - require.NoError(t, err) - _, _, err = cli.Run("board", "list") - require.NoError(t, err) - - // check that the CLI does not crash if an invalid discovery is installed - // (for example if the installation fails midway). - // https://github.com/arduino/arduino-cli/issues/1669 - toolDir := cli.DataDir().Join("packages", "builtin", "tools", "serial-discovery") - dirsToEmpty, err := toolDir.ReadDir() - require.NoError(t, err) - require.Len(t, dirsToEmpty, 1) - require.NoError(t, dirsToEmpty[0].RemoveAll()) - require.NoError(t, dirsToEmpty[0].MkdirAll()) - - _, stderr, err := cli.Run("board", "list") - require.NoError(t, err) - require.Contains(t, string(stderr), "builtin:serial-discovery") -} - func TestBoardListall(t *testing.T) { env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t) defer env.CleanUp()