Merge pull request #12 from cego/race-detector-test

Fixed TestConcurrency *itself* when testing with the race detector

main_test.go

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 	"reflect"
+	"sync"
 	"testing"
 	"time"
 
@@ -327,6 +328,8 @@ keep latest 1
 }
 
 func TestConcurrency(t *testing.T) {
+	var lock sync.Mutex
+
 	tmpfile, _ := ioutil.TempFile("/dev/shm", "test.TestReadConfSyntaxError")
 	defer os.Remove(tmpfile.Name())
 
@@ -337,9 +340,13 @@ func TestConcurrency(t *testing.T) {
 	// This will force clean() to wait for our mainWaitGroup.Done().
 	mainWaitGroup.Add(1)
 
+	lock.Lock()
+
 	var cleanErr error
 	go func() {
 		cleanErr = clean(nil, []string{tmpfile.Name()})
+
+		lock.Unlock()
 	}()
 
 	// Give some time for the first clean() to acquire the lock.
@@ -353,6 +360,8 @@ func TestConcurrency(t *testing.T) {
 	// Let the first clean() exit.
 	mainWaitGroup.Done()
 
+	lock.Lock()
+
 	if cleanErr != nil {
 		t.Fatalf("clean() returned an error: %s", cleanErr.Error())
 	}