Add HTTP Shutdown Timeout (#151)

* add shutdown timeout

* re-enable helper

surveyor/conn_pool_test.go

@@ -13,6 +13,8 @@ import (
 )
 
 func TestConnPool(t *testing.T) {
+	t.Parallel()
+
 	s := natsservertest.RunRandClientPortServer()
 	defer s.Shutdown()
 	o1 := &natsContext{

surveyor/surveyor.go

@@ -497,7 +497,9 @@ func (s *Surveyor) Stop() {
 	}
 
 	if s.httpServer != nil {
-		_ = s.httpServer.Shutdown(context.Background())
+		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+		defer cancel()
+		_ = s.httpServer.Shutdown(ctx)
 		s.httpServer = nil
 	}
 

surveyor/surveyor_test.go

@@ -45,7 +45,7 @@ func httpGetSecure(url string) (*http.Response, error) {
 		return nil, err
 	}
 	transport := &http.Transport{TLSClientConfig: tlsConfig}
-	httpClient := &http.Client{Transport: transport, Timeout: 30 * time.Second}
+	httpClient := &http.Client{Transport: transport, Timeout: 3 * time.Second}
 	return httpClient.Get(url)
 }
 
@@ -70,7 +70,7 @@ func parseTLSConfig(certFile, keyFile, caFile string) (*tls.Config, error) {
 }
 
 func httpGet(url string) (*http.Response, error) {
-	httpClient := &http.Client{Timeout: 30 * time.Second}
+	httpClient := &http.Client{Timeout: 3 * time.Second}
 	return httpClient.Get(url)
 }