fix: test sse

Author: zhufuyi

pkg/sse/client_test.go

@@ -56,38 +56,25 @@ func TestSSEClient_Connect(t *testing.T) {
 
 func TestSSEClient_Reconnect(t *testing.T) {
 	port, _ := utils.GetAvailablePort()
+	t.Log("use port", port)
 	eventType := DefaultEventType
-	ctx, cancel := context.WithCancel(context.Background())
-	hub := NewHub(WithContext(ctx, cancel))
-	go runSSEServer2(ctx, port, hub)
 
 	client := NewClient(fmt.Sprintf("http://localhost:%d/events", port), WithClientReconnectTimeInterval(time.Millisecond*100))
 	client.OnEvent(eventType, func(event *Event) {
 		t.Log("on event", event)
 	})
 	err := client.Connect()
 	assert.NoError(t, err)
-	time.Sleep(200 * time.Millisecond)
-
-	// expected connect is true
-	assert.True(t, client.GetConnectStatus(), "Client should be connected")
+	time.Sleep(300 * time.Millisecond)
 
-	// close sse server
-	hub.Close()
-
-	time.Sleep(time.Millisecond * 300)
-	// expected connect is false
-	assert.False(t, client.GetConnectStatus(), "Client should be disconnected")
-
-	// run sse server again
-	ctx, cancel = context.WithCancel(context.Background())
-	hub = NewHub(WithContext(ctx, cancel))
-	go runSSEServer2(ctx, port, hub)
+	// run sse server
+	ctx, cancel := context.WithCancel(context.Background())
+	hub := NewHub(WithContext(ctx, cancel))
 	defer hub.Close()
-	_ = client.Connect()
+	go runSSEServer(port, hub)
 
 	// wait for client to reconnect
-	time.Sleep(2 * time.Second)
+	time.Sleep(3 * time.Second)
 
 	// expected connect is true
 	assert.True(t, client.GetConnectStatus(), "Client should be connected again")

pkg/sse/server_test.go

@@ -1,9 +1,7 @@
 package sse
 
 import (
-	"context"
 	"fmt"
-	"net"
 	"net/http"
 	"strconv"
 	"testing"
@@ -29,33 +27,6 @@ func runSSEServer(port int, hub *Hub) {
 	r.Run(":" + strconv.Itoa(port))
 }
 
-func runSSEServer2(ctx context.Context, port int, hub *Hub) {
-	gin.SetMode(gin.ReleaseMode)
-	r := gin.New()
-	count := 10000
-	r.GET("/events", func(c *gin.Context) {
-		count++
-		uid := strconv.Itoa(count) // mock user id
-		hub.Serve(c, uid)
-	})
-
-	listener, err := net.Listen("tcp", ":"+strconv.Itoa(port))
-	if err != nil {
-		panic(err)
-	}
-	srv := &http.Server{Handler: r}
-
-	go func() {
-		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			panic(err)
-		}
-	}()
-
-	<-ctx.Done()
-	_ = listener.Close()
-	_ = srv.Shutdown(ctx)
-}
-
 func TestServe(t *testing.T) {
 	port, _ := utils.GetAvailablePort()
 	eventType := DefaultEventType