Fix utils race and error while in -race mode

- Using a safe map instead of a simple map for `TestInParallel` and
  `TestInParallelError` to be sure we don't have a data race while
  running the tests.
- Putting these two (`TestInParallel` and `TestInParallelError`) into a
  separate test file with build tag `!race`. `InParallel` relies on
  `sync.Pool` and `sync.Pool` is no-op in `-race` mode ; this means
  `TestInParallel` is always OK, `TestInParallelError` is always KO when
  race detector is on.

Signed-off-by: Vincent Demeester <[email protected]>

Author: vdemeester

utils/util_inparallel_test.go

@@ -0,0 +1,84 @@
+// +build !race
+
+package utils
+
+import (
+	"fmt"
+	"sync"
+	"testing"
+)
+
+type safeMap struct {
+	mu sync.RWMutex
+	m  map[int]bool
+}
+
+func (s *safeMap) Add(index int, ok bool) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.m[index] = ok
+}
+
+func (s *safeMap) Read() map[int]bool {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	return s.m
+}
+
+func TestInParallel(t *testing.T) {
+	size := 5
+	booleanMap := safeMap{
+		m: make(map[int]bool, size+1),
+	}
+	tasks := InParallel{}
+	for i := 0; i < size; i++ {
+		task := func(index int) func() error {
+			return func() error {
+				booleanMap.Add(index, true)
+				return nil
+			}
+		}(i)
+		tasks.Add(task)
+	}
+	err := tasks.Wait()
+	if err != nil {
+		t.Fatal(err)
+	}
+	// Make sure every value is true
+	for _, value := range booleanMap.Read() {
+		if !value {
+			t.Fatalf("booleanMap expected to contain only true values, got at least one false")
+		}
+	}
+}
+
+func TestInParallelError(t *testing.T) {
+	size := 5
+	booleanMap := safeMap{
+		m: make(map[int]bool, size+1),
+	}
+	tasks := InParallel{}
+	for i := 0; i < size; i++ {
+		task := func(index int) func() error {
+			return func() error {
+				booleanMap.Add(index, true)
+				t.Log("index", index)
+				if index%2 == 0 {
+					t.Log("return an error for", index)
+					return fmt.Errorf("Error with %v", index)
+				}
+				return nil
+			}
+		}(i)
+		tasks.Add(task)
+	}
+	err := tasks.Wait()
+	if err == nil {
+		t.Fatalf("Expected an error on Wait, got nothing.")
+	}
+	for key, value := range booleanMap.Read() {
+		if key%2 != 0 && !value {
+			t.Fatalf("booleanMap expected to contain true values on odd number, got %v", booleanMap)
+		}
+	}
+}

utils/util_test.go

@@ -17,58 +17,6 @@ type jsonto struct {
 	Elt3 int
 }
 
-func TestInParallel(t *testing.T) {
-	size := 5
-	booleanMap := make(map[int]bool, size+1)
-	tasks := InParallel{}
-	for i := 0; i < size; i++ {
-		task := func(index int) func() error {
-			return func() error {
-				booleanMap[index] = true
-				return nil
-			}
-		}(i)
-		tasks.Add(task)
-	}
-	err := tasks.Wait()
-	if err != nil {
-		t.Fatal(err)
-	}
-	// Make sure every value is true
-	for _, value := range booleanMap {
-		if !value {
-			t.Fatalf("booleanMap expected to contain only true values, got at least one false")
-		}
-	}
-}
-
-func TestInParallelError(t *testing.T) {
-	size := 5
-	booleanMap := make(map[int]bool, size+1)
-	tasks := InParallel{}
-	for i := 0; i < size; i++ {
-		task := func(index int) func() error {
-			return func() error {
-				booleanMap[index] = true
-				if index%2 == 0 {
-					return fmt.Errorf("Error with %v", index)
-				}
-				return nil
-			}
-		}(i)
-		tasks.Add(task)
-	}
-	err := tasks.Wait()
-	if err == nil {
-		t.Fatalf("Expected an error on Wait, got nothing.")
-	}
-	for key, value := range booleanMap {
-		if key%2 != 0 && !value {
-			t.Fatalf("booleanMap expected to contain true values on odd number, got %v", booleanMap)
-		}
-	}
-}
-
 func TestConvertByJSON(t *testing.T) {
 	valids := []struct {
 		src      jsonfrom