From 8f0a42efa0fb25af5fa2d972fb6dad63eb5e0538 Mon Sep 17 00:00:00 2001
From: Tom Thorogood <me+github@tomthorogood.co.uk>
Date: Mon, 10 Sep 2018 05:17:16 +0930
Subject: [PATCH] Fix TestServerStartStopRace calling t.Fatal on wrong
 goroutine (#739)

---
 server_test.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server_test.go b/server_test.go
index 9bcf37d7..e8fc05d2 100644
--- a/server_test.go
+++ b/server_test.go
@@ -685,19 +685,21 @@ func TestShutdownUDP(t *testing.T) {
 }
 
 func TestServerStartStopRace(t *testing.T) {
+	var wg sync.WaitGroup
 	for i := 0; i < 10; i++ {
-		var err error
-		s := &Server{}
-		s, _, _, err = RunLocalUDPServerWithFinChan(":0")
+		wg.Add(1)
+		s, _, _, err := RunLocalUDPServerWithFinChan(":0")
 		if err != nil {
 			t.Fatalf("could not start server: %s", err)
 		}
 		go func() {
+			defer wg.Done()
 			if err := s.Shutdown(); err != nil {
-				t.Fatalf("could not stop server: %s", err)
+				t.Errorf("could not stop server: %s", err)
 			}
 		}()
 	}
+	wg.Wait()
 }
 
 type ExampleFrameLengthWriter struct {