testsuite: added functions to setup arduino-cli integration tests

Author: cmaglie

internal/integrationtest/arduino-cli.go

@@ -23,6 +23,7 @@ import (
 	"os"
 	"strings"
 	"sync"
+	"testing"
 	"time"
 
 	"github.com/arduino/arduino-cli/executils"
@@ -34,6 +35,30 @@ import (
 	"google.golang.org/grpc"
 )
 
+// FindRepositoryRootPath returns the repository root path
+func FindRepositoryRootPath(t *testing.T) *paths.Path {
+	repoRootPath := paths.New(".")
+	require.NoError(t, repoRootPath.ToAbs())
+	for !repoRootPath.Join(".git").Exist() {
+		require.Contains(t, repoRootPath.String(), "arduino-cli", "Error searching for repository root path")
+		repoRootPath = repoRootPath.Parent()
+	}
+	return repoRootPath
+}
+
+// CreateArduinoCLIWithEnvironment performs the minimum amount of actions
+// to build the default test environment.
+func CreateArduinoCLIWithEnvironment(t *testing.T) (*testsuite.Environment, *ArduinoCLI) {
+	env := testsuite.NewEnvironment(t)
+
+	cli := NewArduinoCliWithinEnvironment(env, &ArduinoCLIConfig{
+		ArduinoCLIPath:         FindRepositoryRootPath(t).Join("arduino-cli"),
+		UseSharedStagingFolder: true,
+	})
+
+	return env, cli
+}
+
 // ArduinoCLI is an Arduino CLI client.
 type ArduinoCLI struct {
 	path          *paths.Path

internal/integrationtest/core/core_list_test.go

@@ -21,21 +21,14 @@ import (
 	"github.com/arduino/arduino-cli/internal/integrationtest"
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
-	"go.bug.st/testsuite"
 	"go.bug.st/testsuite/requirejson"
 )
 
 func TestCorrectHandlingOfPlatformVersionProperty(t *testing.T) {
 	// See: https://github.com/arduino/arduino-cli/issues/1823
-
-	env := testsuite.NewEnvironment(t)
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
 	defer env.CleanUp()
 
-	cli := integrationtest.NewArduinoCliWithinEnvironment(env, &integrationtest.ArduinoCLIConfig{
-		ArduinoCLIPath:         paths.New("..", "..", "..", "arduino-cli"),
-		UseSharedStagingFolder: true,
-	})
-
 	// Copy test platform
 	testPlatform := paths.New("testdata", "issue_1823", "DxCore-dev")
 	require.NoError(t, testPlatform.CopyDirTo(cli.SketchbookDir().Join("hardware", "DxCore-dev")))

internal/integrationtest/core/core_test.go

@@ -23,19 +23,13 @@ import (
 	"github.com/arduino/arduino-cli/internal/integrationtest"
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
-	"go.bug.st/testsuite"
 	"go.bug.st/testsuite/requirejson"
 )
 
 func TestCoreSearch(t *testing.T) {
-	env := testsuite.NewEnvironment(t)
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
 	defer env.CleanUp()
 
-	cli := integrationtest.NewArduinoCliWithinEnvironment(env, &integrationtest.ArduinoCLIConfig{
-		ArduinoCLIPath:         paths.New("..", "..", "..", "arduino-cli"),
-		UseSharedStagingFolder: true,
-	})
-
 	// Set up an http server to serve our custom index file
 	test_index := paths.New("..", "testdata", "test_index.json")
 	url := env.HTTPServeFile(8000, test_index)