http2,tests: undo changes related to ExampleServer

Author: pires

helper/http2/http2.go

@@ -187,11 +187,6 @@ func (srv *Server) serveConn(baseCtx context.Context, conn net.Conn) error {
 	}
 }
 
-// Close closes the server by closing all listeners.
-func (srv *Server) Close() error {
-	return srv.closeListeners()
-}
-
 func (srv *Server) closeListeners() error {
 	srv.mu.Lock()
 	defer srv.mu.Unlock()

helper/http2/http2_test.go

@@ -21,7 +21,7 @@ import (
 )
 
 func ExampleServer() {
-	ln, err := net.Listen("tcp", "localhost:0")
+	ln, err := net.Listen("tcp", "localhost:80")
 	if err != nil {
 		log.Fatalf("failed to listen: %v", err)
 	}
@@ -36,20 +36,9 @@ func ExampleServer() {
 			_, _ = w.Write([]byte("Hello world!\n"))
 		}),
 	}, nil)
-	// Run the server in a goroutine.
-	go func() {
-		if err := server.Serve(proxyLn); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			log.Fatalf("failed to serve: %v", err)
-		}
-	}()
-
-	time.Sleep(1 * time.Second)
-
-	if err := server.Close(); err != nil {
-		log.Fatalf("failed to close server: %v", err)
+	if err := server.Serve(proxyLn); err != nil {
+		log.Fatalf("failed to serve: %v", err)
 	}
-
-	// Output:
 }
 
 type contextKey string