Merge pull request #60 from Jigsaw-Code/bemasc-race

Fix data races in the tests

Author: Benjamin M. Schwartz

.github/workflows/go.yml

@@ -34,4 +34,4 @@ jobs:
       run: go build -v ./...
 
     - name: Test
-      run: go test -v ./...
+      run: go test -v -race -bench=. -benchtime=100ms ./...

tunnel/intra/doh/ipmap/ipmap_test.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"errors"
 	"net"
+	"sync/atomic"
 	"testing"
 )
 
@@ -153,11 +154,11 @@ func TestDisconfirmMismatch(t *testing.T) {
 }
 
 func TestResolver(t *testing.T) {
-	flag := false
+	var dialCount int32
 	resolver := &net.Resolver{
 		PreferGo: true,
 		Dial: func(context context.Context, network, address string) (net.Conn, error) {
-			flag = true
+			atomic.AddInt32(&dialCount, 1)
 			return nil, errors.New("Fake dialer")
 		},
 	}
@@ -166,7 +167,7 @@ func TestResolver(t *testing.T) {
 	if !s.Empty() {
 		t.Error("Google lookup should have failed due to fake dialer")
 	}
-	if !flag {
+	if atomic.LoadInt32(&dialCount) == 0 {
 		t.Error("Fake dialer didn't run")
 	}
 }

tunnel/intra/protect/protect_test.go

@@ -3,18 +3,21 @@ package protect
 import (
 	"context"
 	"net"
+	"sync"
 	"syscall"
 	"testing"
 )
 
 // The fake protector just records the file descriptors it was given.
 type fakeProtector struct {
-	Protector
+	mu  sync.Mutex
 	fds []int32
 }
 
 func (p *fakeProtector) Protect(fd int32) bool {
+	p.mu.Lock()
 	p.fds = append(p.fds, fd)
+	p.mu.Unlock()
 	return true
 }