remove call to t.Fatal from non-test goroutine

Author: AnthonyMichaelTDM

src/mod/websocketproxy/websocketproxy_test.go

@@ -37,13 +37,18 @@ func TestProxy(t *testing.T) {
 
 	mux := http.NewServeMux()
 	mux.Handle("/proxy", proxy)
+	errChan := make(chan error)
 	go func() {
 		if err := http.ListenAndServe(":7777", mux); err != nil {
-			t.Fatal("ListenAndServe: ", err)
+			errChan <- err
 		}
 	}()
 
-	time.Sleep(time.Millisecond * 100)
+	select {
+	case err := <-errChan:
+		t.Fatal("ListenAndServe: ", err)
+	case <-time.After(time.Millisecond * 100):
+	}
 
 	// backend echo server
 	go func() {
@@ -73,11 +78,15 @@ func TestProxy(t *testing.T) {
 
 		err := http.ListenAndServe(":8888", mux2)
 		if err != nil {
-			t.Fatal("ListenAndServe: ", err)
+			errChan <- err
 		}
 	}()
 
-	time.Sleep(time.Millisecond * 100)
+	select {
+	case err := <-errChan:
+		t.Fatal("ListenAndServe: ", err)
+	case <-time.After(time.Millisecond * 100):
+	}
 
 	// let's us define two subprotocols, only one is supported by the server
 	clientSubProtocols := []string{"test-protocol", "test-notsupported"}