diff options
Diffstat (limited to 'src/net/http/export_test.go')
| -rw-r--r-- | src/net/http/export_test.go | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/src/net/http/export_test.go b/src/net/http/export_test.go index 472d9c37ae..b499769c4f 100644 --- a/src/net/http/export_test.go +++ b/src/net/http/export_test.go @@ -29,7 +29,6 @@ var ( ExportErrServerClosedIdle = errServerClosedIdle ExportServeFile = serveFile ExportScanETag = scanETag - ExportHttp2ConfigureServer = http2ConfigureServer Export_shouldCopyHeaderOnRedirect = shouldCopyHeaderOnRedirect Export_writeStatusLine = writeStatusLine Export_is408Message = is408Message @@ -135,29 +134,15 @@ func (t *Transport) IdleConnStrsForTesting() []string { defer t.idleMu.Unlock() for _, conns := range t.idleConn { for _, pc := range conns { + if pc.conn == nil { + continue + } ret = append(ret, pc.conn.LocalAddr().String()+"/"+pc.conn.RemoteAddr().String()) } } - slices.Sort(ret) - return ret -} - -func (t *Transport) IdleConnStrsForTesting_h2() []string { - var ret []string - noDialPool := t.h2transport.(*http2Transport).ConnPool.(http2noDialClientConnPool) - pool := noDialPool.http2clientConnPool - - pool.mu.Lock() - defer pool.mu.Unlock() - - for k, ccs := range pool.conns { - for _, cc := range ccs { - if cc.idleState().canTakeNewRequest { - ret = append(ret, k) - } - } + if f, ok := t.h2transport.(interface{ IdleConnStrsForTesting() []string }); ok { + ret = append(ret, f.IdleConnStrsForTesting()...) } - slices.Sort(ret) return ret } @@ -256,15 +241,6 @@ func hookSetter(dst *func()) func(func()) { } } -func ExportHttp2ConfigureTransport(t *Transport) error { - t2, err := http2configureTransports(t) - if err != nil { - return err - } - t.h2transport = t2 - return nil -} - func (s *Server) ExportAllConnsIdle() bool { s.mu.Lock() defer s.mu.Unlock() |