updating test (core download not working under concurrent race

Author: saniales

auth/auth_test.go

@@ -0,0 +1 @@
+package auth_test

cmd/cmd_test.go

@@ -122,8 +122,10 @@ func TestLibDownload(t *testing.T) {
 
 	// getting what I want...
 	var have, want output.LibProcessResults
-	err = json.Unmarshal([]byte(fmt.Sprintf(`{"libraries":[{"name":"invalidLibrary","error":"Library not found"},{"name":"YoutubeApi","status":"Downloaded","path":"%s/YoutubeApi-1.0.0.zip"},{"name":"YouMadeIt","error":"Version Not Found"}]}`,
-		stagingFolder)), &want)
+	jsonObj := fmt.Sprintf(`{"libraries":[{"name":"invalidLibrary","error":"Library not found"},{"name":"YoutubeApi","status":"Downloaded","path":"%s/YoutubeApi-1.0.0.zip"},{"name":"YouMadeIt","error":"Version Not Found"}]}`,
+		stagingFolder)
+	t.Log(jsonObj)
+	err = json.Unmarshal([]byte(jsonObj), &want)
 	if err != nil {
 		t.Error("JSON marshalling error. TestLibDownload want. " + err.Error())
 	}
@@ -140,7 +142,7 @@ func TestLibDownload(t *testing.T) {
 	d, _ := ioutil.ReadAll(tempFile)
 	err = json.Unmarshal(d, &have)
 	if err != nil {
-		t.Error("JSON marshalling error. TestLibDownload have")
+		t.Error("JSON marshalling error. TestLibDownload have ", jsonObj)
 	}
 
 	//checking if it is what I want...
@@ -164,6 +166,76 @@ func TestLibDownload(t *testing.T) {
 	}
 }
 
+func TestCoreDownload(t *testing.T) {
+	tempFile := createTempRedirect()
+	defer cleanTempRedirect(tempFile)
+
+	// getting the paths to create the want path of the want object.
+	stagingFolder, err := common.GetDownloadCacheFolder("packages")
+	if err != nil {
+		t.Error("Cannot get cache folder")
+	}
+
+	// getting what I want...
+	var have, want output.CoreProcessResults
+	jsonObj := strings.Replace(`{"cores":[{"name":"unparsablearg","error":"Invalid item (not PACKAGER:CORE[=VERSION])"},{"name":"sam","error":"Version notexistingversion Not Found"},{"name":"sam","error":"Version 1.0.0 Not Found"},{"name":"samd","status":"Downloaded","path":"%s/samd-1.6.15.tar.bz2"}],"tools":[{"name":"arduinoOTA","status":"Downloaded","path":"%s/arduinoOTA-1.2.0-linux_amd64.tar.bz2"},{"name":"openocd","status":"Downloaded","path":"%s/openocd-0.9.0-arduino6-static-x86_64-linux-gnu.tar.bz2"},{"name":"CMSIS-Atmel","status":"Downloaded","path":"%s/CMSIS-Atmel-1.1.0.tar.bz2"},{"name":"CMSIS","status":"Downloaded","path":"%s/CMSIS-4.5.0.tar.bz2"},{"name":"arm-none-eabi-gcc","status":"Downloaded","path":"%s/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz"},{"name":"bossac","status":"Downloaded","path":"%s/bossac-1.7.0-x86_64-linux-gnu.tar.gz"}]}`,
+		"%s", stagingFolder, 8)
+
+	t.Log(jsonObj)
+	err = json.Unmarshal([]byte(jsonObj), &want)
+	if err != nil {
+		t.Error("JSON marshalling error. TestCoreDownload want. " + err.Error())
+	}
+
+	// arduino lib download YoutubeApi --format json
+	executeWithArgs("core", "download", "arduino:samd", "unparsablearg", "arduino:sam=notexistingversion", "arduino:sam=1.0.0", "--format", "json")
+
+	//resetting the file to allow the full read (it has been written by executeWithArgs)
+	_, err = tempFile.Seek(0, 0)
+	if err != nil {
+		t.Error("Cannot set file for read mode")
+	}
+
+	d, _ := ioutil.ReadAll(tempFile)
+	err = json.Unmarshal(d, &have)
+	if err != nil {
+		t.Error("JSON marshalling error ", d)
+	}
+
+	//checking if it is what I want...
+	if len(have.Cores) != len(want.Cores) || len(have.Tools) != len(want.Tools) {
+		t.Error("Output not matching, different line number from command", len(have.Cores), len(want.Cores), len(have.Tools), len(want.Tools))
+	}
+
+	for _, itemHave := range have.Cores {
+		ok := false
+		for _, itemWant := range want.Cores {
+			//t.Log(itemHave, " -------- ", itemWant)
+			if itemHave.String() == itemWant.String() {
+				ok = true
+				break
+			}
+		}
+		if !ok {
+			t.Errorf(`Got "%s" not found`, itemHave)
+		}
+	}
+
+	for _, itemHave := range have.Tools {
+		ok := false
+		for _, itemWant := range want.Tools {
+			//t.Log(itemHave, " -------- ", itemWant)
+			if itemHave.String() == itemWant.String() {
+				ok = true
+				break
+			}
+		}
+		if !ok {
+			t.Errorf(`Got "%s" not found`, itemHave)
+		}
+	}
+}
+
 func checkOutput(t *testing.T, want []string, tempFile *os.File) {
 	_, err := tempFile.Seek(0, 0)
 	if err != nil {

common/net_functions.go

@@ -76,7 +76,7 @@ func DownloadPackage(URL string, initialData *os.File, totalSize int64, handleRe
 		return errors.New("Cannot fill a nil file pointer")
 	}
 
-	client := http.DefaultClient
+	client := &http.Client{}
 
 	var initialSize int64
 	stats, err := initialData.Stat()

task/concurrency.go

@@ -31,7 +31,6 @@ package task
 
 import (
 	"fmt"
-	"sync"
 
 	"github.com/bcmi-labs/arduino-cli/cmd/formatter"
 )
@@ -81,21 +80,20 @@ func ExecuteSequence(taskWrappers []Wrapper, ignoreOnFailure []bool, verbosity i
 // ExecuteParallelFromMap executes a set of taskwrappers in parallel, taking input from a map[string]Wrapper.
 func ExecuteParallelFromMap(taskMap map[string]Wrapper, verbosity int) map[string]Result {
 	results := make(chan resultWithKey, len(taskMap))
-	wg := sync.WaitGroup{}
-	wg.Add(len(taskMap))
+	turn := make(chan bool)
 
 	for key, task := range taskMap {
-		go func(key string, task Wrapper, wg *sync.WaitGroup) {
+		go func(key string, task Wrapper) {
+			turn <- true
 			results <- resultWithKey{
 				Key: key,
 				Result: func() Result {
-					defer wg.Done()
 					return task.Execute(verbosity)
 				}(),
 			}
-		}(key, task, &wg)
+			<-turn
+		}(key, task)
 	}
-	wg.Wait()
 	close(results)
 	mapResult := make(map[string]Result, len(results))
 	for result := range results {
@@ -108,17 +106,16 @@ func ExecuteParallelFromMap(taskMap map[string]Wrapper, verbosity int) map[strin
 // ExecuteParallel executes a set of Wrappers in parallel, handling concurrency for results.
 func ExecuteParallel(taskWrappers []Wrapper, verbosity int) []Result {
 	results := make(chan Result, len(taskWrappers))
-	wg := sync.WaitGroup{}
-	wg.Add(len(taskWrappers))
+	turn := make(chan bool)
 	for _, task := range taskWrappers {
-		go func(task Wrapper, wg *sync.WaitGroup) {
-			results <- func(wg *sync.WaitGroup) Result {
-				defer wg.Done()
+		go func(task Wrapper) {
+			turn <- true
+			results <- func() Result {
 				return task.Execute(verbosity)
-			}(wg)
-		}(task, &wg)
+			}()
+			<-turn
+		}(task)
 	}
-	wg.Wait()
 	close(results)
 	array := make([]Result, len(results))
 	for i := range array {