From 56ff2a58cc840616dc263741b8a428235b50a3f3 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Fri, 30 May 2025 12:47:53 +0800
Subject: [PATCH] http3: use actual QUIC connection in stream tests (#5170)

---
 http3/http_stream_test.go | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/http3/http_stream_test.go b/http3/http_stream_test.go
index 1694289c..64ab050d 100644
--- a/http3/http_stream_test.go
+++ b/http3/http_stream_test.go
@@ -9,9 +9,9 @@ import (
 	"net/http/httptest"
 	"net/http/httptrace"
 	"testing"
+	"time"
 
 	"github.com/quic-go/quic-go"
-	mockquic "github.com/quic-go/quic-go/internal/mocks/quic"
 	"github.com/quic-go/quic-go/internal/protocol"
 
 	"github.com/quic-go/qpack"
@@ -32,11 +32,12 @@ func TestStreamReadDataFrames(t *testing.T) {
 	qstr.EXPECT().Write(gomock.Any()).DoAndReturn(buf.Write).AnyTimes()
 	qstr.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
 
+	clientConn, _ := newConnPair(t)
 	str := newStream(
 		qstr,
 		newConnection(
-			context.Background(),
-			mockquic.NewMockEarlyConnection(mockCtrl),
+			clientConn.Context(),
+			clientConn,
 			false,
 			protocol.PerspectiveClient,
 			nil,
@@ -78,30 +79,32 @@ func TestStreamReadDataFrames(t *testing.T) {
 
 func TestStreamInvalidFrame(t *testing.T) {
 	var buf bytes.Buffer
+	b := (&settingsFrame{}).Append(nil)
+	buf.Write(b)
+
 	mockCtrl := gomock.NewController(t)
 	qstr := NewMockDatagramStream(mockCtrl)
 	qstr.EXPECT().Write(gomock.Any()).DoAndReturn(buf.Write).AnyTimes()
 	qstr.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
-	conn := mockquic.NewMockEarlyConnection(mockCtrl)
-	var errCode quic.ApplicationErrorCode
-	conn.EXPECT().CloseWithError(gomock.Any(), gomock.Any()).Do(
-		func(e quic.ApplicationErrorCode, msg string) error {
-			errCode = e
-			return nil
-		},
-	).AnyTimes()
+	clientConn, serverConn := newConnPair(t)
 
 	str := newStream(
 		qstr,
-		newConnection(context.Background(), conn, false, protocol.PerspectiveClient, nil, 0),
+		newConnection(context.Background(), clientConn, false, protocol.PerspectiveClient, nil, 0),
 		func(r io.Reader, u uint64) error { return nil },
 	)
 
-	b := (&settingsFrame{}).Append(nil)
-	buf.Write(b)
 	_, err := str.Read([]byte{0})
 	require.ErrorContains(t, err, "peer sent an unexpected frame")
-	require.Equal(t, quic.ApplicationErrorCode(ErrCodeFrameUnexpected), errCode)
+
+	select {
+	case <-serverConn.Context().Done():
+		var appErr *quic.ApplicationError
+		require.ErrorAs(t, context.Cause(serverConn.Context()), &appErr)
+		require.Equal(t, quic.ApplicationErrorCode(ErrCodeFrameUnexpected), appErr.ErrorCode)
+	case <-time.After(time.Second):
+		t.Fatal("timeout")
+	}
 }
 
 func TestStreamWrite(t *testing.T) {
@@ -136,11 +139,11 @@ func TestRequestStream(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	qstr := NewMockDatagramStream(mockCtrl)
 	requestWriter := newRequestWriter()
-	conn := mockquic.NewMockEarlyConnection(mockCtrl)
+	clientConn, _ := newConnPair(t)
 	str := newRequestStream(
 		newStream(
 			qstr,
-			newConnection(context.Background(), conn, false, protocol.PerspectiveClient, nil, 0),
+			newConnection(context.Background(), clientConn, false, protocol.PerspectiveClient, nil, 0),
 			func(r io.Reader, u uint64) error { return nil },
 		),
 		requestWriter,