Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
 handler.ServeHTTP(w, r)
 }
 }))
 t.Logf("coderdtest server listening on %s", srv.Listener.Addr().String())
 srv.Config.BaseContext = func(_ net.Listener) context.Context {
 return ctx
 }
 } else {
 srv.Start()
 }
 t.Cleanup(srv.Close)
 t.Logf("coderdtest server started on %s", srv.URL)
 t.Cleanup(func() {
 t.Logf("closing coderdtest server on %s", srv.Listener.Addr().String())
 srv.Close()
 t.Logf("closed coderdtest server on %s", srv.Listener.Addr().String())
 })

 tcpAddr, ok := srv.Listener.Addr().(*net.TCPAddr)
 require.True(t, ok)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -421,6 +421,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
		handler.ServeHTTP(w, r)
		}
		}))
		t.Logf("coderdtest server listening on %s", srv.Listener.Addr().String())
Copy link Member johnstcnApr 14, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. suggestion: extract for later re-use in`defer()` below Copy link ContributorAuthor spikecurtisApr 14, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I'm paranoid, and would prefer to re-query them.
		srv.Config.BaseContext = func(_ net.Listener) context.Context {
		return ctx
		}
Expand All		@@ -433,7 +434,12 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
		} else {
		srv.Start()
		}
		t.Cleanup(srv.Close)
		t.Logf("coderdtest server started on %s", srv.URL)
johnstcn marked this conversation as resolved. Show resolvedHide resolved
		t.Cleanup(func() {
		t.Logf("closing coderdtest server on %s", srv.Listener.Addr().String())
		srv.Close()
		t.Logf("closed coderdtest server on %s", srv.Listener.Addr().String())
		})

		tcpAddr, ok := srv.Listener.Addr().(*net.TCPAddr)
		require.True(t, ok)
Expand Down