Use subtest to manually install core once

Author: MatteoPologruto

internal/integrationtest/compile/compile_part_3_test.go

@@ -25,6 +25,33 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing"
 )
 
+func TestCompilePart3(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	_, _, err := cli.Run("update")
+	require.NoError(t, err)
+
+	// Manually installs a core in sketchbooks hardware folder
+	gitUrl := "https://github.com/arduino/ArduinoCore-avr.git"
+	repoDir := cli.SketchbookDir().Join("hardware", "arduino-beta-development", "avr")
+	_, err = git.PlainClone(repoDir.String(), false, &git.CloneOptions{
+		URL:           gitUrl,
+		ReferenceName: plumbing.NewTagReferenceName("1.8.3"),
+	})
+	require.NoError(t, err)
+
+	// Installs also the same core via CLI so all the necessary tools are installed
+	_, _, err = cli.Run("core", "install", "arduino:[email protected]")
+	require.NoError(t, err)
+
+	integrationtest.CLISubtests{
+		{"ManuallyInstalledPlatform", compileManuallyInstalledPlatform},
+		{"ManuallyInstalledPlatformUsingPlatformLocalTxt", compileManuallyInstalledPlatformUsingPlatformLocalTxt},
+		{"ManuallyInstalledPlatformUsingBoardsLocalTxt", compileManuallyInstalledPlatformUsingBoardsLocalTxt},
+	}.Run(t, env, cli)
+}
+
 func TestCompileWithFullyPrecompiledLibrary(t *testing.T) {
 	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
 	defer env.CleanUp()
@@ -61,73 +88,65 @@ func TestCompileWithFullyPrecompiledLibrary(t *testing.T) {
 	require.Contains(t, string(stdout), "Skipping dependencies detection for precompiled library Arduino_TensorFlowLite")
 }
 
-func TestCompileManuallyInstalledPlatform(t *testing.T) {
-	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
-	defer env.CleanUp()
-
-	_, _, err := cli.Run("update")
-	require.NoError(t, err)
-
+func compileManuallyInstalledPlatform(t *testing.T, env *integrationtest.Environment, cli *integrationtest.ArduinoCLI) {
 	sketchName := "CompileSketchManuallyInstalledPlatformUsingPlatformLocalTxt"
 	sketchPath := cli.SketchbookDir().Join(sketchName)
+	defer sketchPath.RemoveAll()
 	fqbn := "arduino-beta-development:avr:uno"
-	_, _, err = cli.Run("sketch", "new", sketchPath.String())
-	require.NoError(t, err)
-
-	// Manually installs a core in sketchbooks hardware folder
-	gitUrl := "https://github.com/arduino/ArduinoCore-avr.git"
-	repoDir := cli.SketchbookDir().Join("hardware", "arduino-beta-development", "avr")
-	_, err = git.PlainClone(repoDir.String(), false, &git.CloneOptions{
-		URL:           gitUrl,
-		ReferenceName: plumbing.NewTagReferenceName("1.8.3"),
-	})
-	require.NoError(t, err)
-
-	// Installs also the same core via CLI so all the necessary tools are installed
-	_, _, err = cli.Run("core", "install", "arduino:[email protected]")
+	_, _, err := cli.Run("sketch", "new", sketchPath.String())
 	require.NoError(t, err)
 
 	// Verifies compilation works without issues
 	_, _, err = cli.Run("compile", "--clean", "-b", fqbn, sketchPath.String())
 	require.NoError(t, err)
 }
 
-func TestCompileManuallyInstalledPlatformUsingPlatformLocalTxt(t *testing.T) {
-	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
-	defer env.CleanUp()
-
-	_, _, err := cli.Run("update")
-	require.NoError(t, err)
-
+func compileManuallyInstalledPlatformUsingPlatformLocalTxt(t *testing.T, env *integrationtest.Environment, cli *integrationtest.ArduinoCLI) {
 	sketchName := "CompileSketchManuallyInstalledPlatformUsingPlatformLocalTxt"
 	sketchPath := cli.SketchbookDir().Join(sketchName)
+	defer sketchPath.RemoveAll()
 	fqbn := "arduino-beta-development:avr:uno"
-	_, _, err = cli.Run("sketch", "new", sketchPath.String())
-	require.NoError(t, err)
-
-	// Manually installs a core in sketchbooks hardware folder
-	gitUrl := "https://github.com/arduino/ArduinoCore-avr.git"
-	repoDir := cli.SketchbookDir().Join("hardware", "arduino-beta-development", "avr")
-	_, err = git.PlainClone(repoDir.String(), false, &git.CloneOptions{
-		URL:           gitUrl,
-		ReferenceName: plumbing.NewTagReferenceName("1.8.3"),
-	})
-	require.NoError(t, err)
-
-	// Installs also the same core via CLI so all the necessary tools are installed
-	_, _, err = cli.Run("core", "install", "arduino:[email protected]")
+	_, _, err := cli.Run("sketch", "new", sketchPath.String())
 	require.NoError(t, err)
 
 	// Verifies compilation works without issues
 	_, _, err = cli.Run("compile", "--clean", "-b", fqbn, sketchPath.String())
 	require.NoError(t, err)
 
 	// Overrides default platform compiler with an unexisting one
+	repoDir := cli.SketchbookDir().Join("hardware", "arduino-beta-development", "avr")
 	platformLocalTxt := repoDir.Join("platform.local.txt")
+	defer platformLocalTxt.Remove()
 	platformLocalTxt.WriteFile([]byte("compiler.c.cmd=my-compiler-that-does-not-exist"))
 
 	// Verifies compilation now fails because compiler is not found
 	_, stderr, err := cli.Run("compile", "--clean", "-b", fqbn, sketchPath.String())
 	require.Error(t, err)
 	require.Contains(t, string(stderr), "my-compiler-that-does-not-exist")
 }
+
+func compileManuallyInstalledPlatformUsingBoardsLocalTxt(t *testing.T, env *integrationtest.Environment, cli *integrationtest.ArduinoCLI) {
+	sketchName := "CompileSketchManuallyInstalledPlatformUsingBoardsLocalTxt"
+	sketchPath := cli.SketchbookDir().Join(sketchName)
+	defer sketchPath.RemoveAll()
+	fqbn := "arduino-beta-development:avr:nessuno"
+	_, _, err := cli.Run("sketch", "new", sketchPath.String())
+	require.NoError(t, err)
+
+	// Verifies compilation fails because board doesn't exist
+	_, stderr, err := cli.Run("compile", "--clean", "-b", fqbn, sketchPath.String())
+	require.Error(t, err)
+	require.Contains(t, string(stderr), "Error during build: Error resolving FQBN: board arduino-beta-development:avr:nessuno not found")
+
+	// Use custom boards.local.txt with made arduino:avr:nessuno board
+	repoDir := cli.SketchbookDir().Join("hardware", "arduino-beta-development", "avr")
+	boardsLocalTxt := repoDir.Join("boards.local.txt")
+	defer boardsLocalTxt.Remove()
+	wd, err := paths.Getwd()
+	require.NoError(t, err)
+	err = wd.Parent().Join("testdata", "boards.local.txt").CopyTo(boardsLocalTxt)
+	require.NoError(t, err)
+
+	_, _, err = cli.Run("compile", "--clean", "-b", fqbn, sketchPath.String())
+	require.NoError(t, err)
+}

internal/integrationtest/compile/compile_part_4_test.go

@@ -163,48 +163,6 @@ func recompileWithDifferentLibrary(t *testing.T, env *integrationtest.Environmen
 	require.NotContains(t, string(stdout), "Using previously compiled file: "+objPath.String())
 }
 
-func TestCompileManuallyInstalledPlatformUsingBoardsLocalTxt(t *testing.T) {
-	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
-	defer env.CleanUp()
-
-	_, _, err := cli.Run("update")
-	require.NoError(t, err)
-
-	sketchName := "CompileSketchManuallyInstalledPlatformUsingBoardsLocalTxt"
-	sketchPath := cli.SketchbookDir().Join(sketchName)
-	fqbn := "arduino-beta-development:avr:nessuno"
-	_, _, err = cli.Run("sketch", "new", sketchPath.String())
-	require.NoError(t, err)
-
-	// Manually installs a core in sketchbooks hardware folder
-	gitUrl := "https://github.com/arduino/ArduinoCore-avr.git"
-	repoDir := cli.SketchbookDir().Join("hardware", "arduino-beta-development", "avr")
-	_, err = git.PlainClone(repoDir.String(), false, &git.CloneOptions{
-		URL:           gitUrl,
-		ReferenceName: plumbing.NewTagReferenceName("1.8.3"),
-	})
-	require.NoError(t, err)
-
-	// Installs also the same core via CLI so all the necessary tools are installed
-	_, _, err = cli.Run("core", "install", "arduino:[email protected]")
-	require.NoError(t, err)
-
-	// Verifies compilation fails because board doesn't exist
-	_, stderr, err := cli.Run("compile", "--clean", "-b", fqbn, sketchPath.String())
-	require.Error(t, err)
-	require.Contains(t, string(stderr), "Error during build: Error resolving FQBN: board arduino-beta-development:avr:nessuno not found")
-
-	// Use custom boards.local.txt with made arduino:avr:nessuno board
-	boardsLocalTxt := repoDir.Join("boards.local.txt")
-	wd, err := paths.Getwd()
-	require.NoError(t, err)
-	err = wd.Parent().Join("testdata", "boards.local.txt").CopyTo(boardsLocalTxt)
-	require.NoError(t, err)
-
-	_, _, err = cli.Run("compile", "--clean", "-b", fqbn, sketchPath.String())
-	require.NoError(t, err)
-}
-
 func TestCompileWithConflictingLibrariesInclude(t *testing.T) {
 	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
 	defer env.CleanUp()