chore: fix TestTailnet/ForcesWebSockets flake (#8953)

coadler · web-flow · commit 758c36822221 · 2023-08-07T21:17:39.000-05:00
diff --git a/coderd/batchstats/batcher.go b/coderd/batchstats/batcher.go
@@ -13,7 +13,6 @@ import (
 
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/sloghuman"
-
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/database/dbauthz"
 	"github.com/coder/coder/codersdk/agentsdk"
diff --git a/tailnet/conn_test.go b/tailnet/conn_test.go
@@ -99,7 +99,7 @@ func TestTailnet(t *testing.T) {
 
 	t.Run("ForcesWebSockets", func(t *testing.T) {
 		t.Parallel()
-		ctx := testutil.Context(t, testutil.WaitLong)
+		ctx := testutil.Context(t, testutil.WaitMedium)
 
 		w1IP := tailnet.IP()
 		derpMap := tailnettest.RunDERPOnlyWebSockets(t)
diff --git a/tailnet/tailnettest/tailnettest.go b/tailnet/tailnettest/tailnettest.go
@@ -77,7 +77,8 @@ func RunDERPOnlyWebSockets(t *testing.T) *tailcfg.DERPMap {
 	handler, closeFunc = tailnet.WithWebsocketSupport(d, handler)
 	server := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Path != "/derp" {
-			handler.ServeHTTP(w, r)
+			w.WriteHeader(http.StatusOK)
+			_, _ = w.Write([]byte("hello"))
 			return
 		}
 		if r.Header.Get("Upgrade") != "websocket" {
