testsuite: Added possibility to use shared download staging folder

Author: cmaglie

internal/integrationtest/arduino-cli.go

@@ -46,21 +46,31 @@ type ArduinoCLI struct {
 	daemonClient  commands.ArduinoCoreServiceClient
 }
 
+// ArduinoCLIConfig
+type ArduinoCLIConfig struct {
+	ArduinoCLIPath         *paths.Path
+	UseSharedStagingFolder bool
+}
+
 // NewArduinoCliWithinEnvironment creates a new Arduino CLI client inside the given environment.
-func NewArduinoCliWithinEnvironment(t *testing.T, cliPath *paths.Path, env *Environment) *ArduinoCLI {
-	cli := NewArduinoCli(t, cliPath)
+func NewArduinoCliWithinEnvironment(t *testing.T, config *ArduinoCLIConfig, env *Environment) *ArduinoCLI {
+	cli := NewArduinoCli(t, config)
+	staging := env.downloadsDir
+	if !config.UseSharedStagingFolder {
+		staging = env.Root().Join("arduino15/staging")
+	}
 	cli.cliEnvVars = []string{
 		fmt.Sprintf("ARDUINO_DATA_DIR=%s", env.Root().Join("arduino15")),
-		fmt.Sprintf("ARDUINO_DOWNLOADS_DIR=%s", env.Root().Join("arduino15/staging")),
+		fmt.Sprintf("ARDUINO_DOWNLOADS_DIR=%s", staging),
 		fmt.Sprintf("ARDUINO_SKETCHBOOK_DIR=%s", env.Root().Join("Arduino")),
 	}
 	return cli
 }
 
 // NewArduinoCli creates a new Arduino CLI client.
-func NewArduinoCli(t *testing.T, cliPath *paths.Path) *ArduinoCLI {
+func NewArduinoCli(t *testing.T, config *ArduinoCLIConfig) *ArduinoCLI {
 	return &ArduinoCLI{
-		path: cliPath,
+		path: config.ArduinoCLIPath,
 		t:    require.New(t),
 	}
 }

internal/integrationtest/arduino-cli_daemon_test.go

@@ -31,7 +31,10 @@ func TestArduinoCliDaemon(t *testing.T) {
 	env := NewEnvironment(t)
 	defer env.CleanUp()
 
-	cli := NewArduinoCliWithinEnvironment(t, paths.New("..", "..", "arduino-cli"), env)
+	cli := NewArduinoCliWithinEnvironment(t, &ArduinoCLIConfig{
+		ArduinoCLIPath:         paths.New("..", "..", "arduino-cli"),
+		UseSharedStagingFolder: true,
+	}, env)
 	defer cli.CleanUp()
 
 	_, _, err := cli.Run("core", "update-index")