update test

Author: AlinsRan

test/e2e/crds/v2/route.go

@@ -2146,11 +2146,10 @@ spec:
 
 			By("verify wss connection")
 			hostname := "api6.com"
-			conn, err := s.NewWebsocketClient(&tls.Config{
+			conn := s.NewWebsocketClient(&tls.Config{
 				InsecureSkipVerify: true,
 				ServerName:         hostname,
 			}, "/ws", http.Header{"Host": []string{hostname}})
-			Expect(err).ShouldNot(HaveOccurred(), "creating WebSocket client")
 
 			defer func() {
 				_ = conn.Close()

test/e2e/gatewayapi/httproute.go

@@ -2506,19 +2506,18 @@ spec:
 
 			By("verify wss connection")
 			hostname := "api6.com"
-			conn, err := s.NewWebsocketClient(&tls.Config{
+			conn := s.NewWebsocketClient(&tls.Config{
 				InsecureSkipVerify: true,
 				ServerName:         hostname,
 			}, "/ws", http.Header{"Host": []string{hostname}})
-			Expect(err).ShouldNot(HaveOccurred(), "creating WebSocket client")
 
 			defer func() {
 				_ = conn.Close()
 			}()
 
 			By("send and receive message through WebSocket")
 			testMessage := "hello, this is APISIX"
-			err = conn.WriteMessage(websocket.TextMessage, []byte(testMessage))
+			err := conn.WriteMessage(websocket.TextMessage, []byte(testMessage))
 			Expect(err).ShouldNot(HaveOccurred(), "writing WebSocket message")
 
 			// Then our echo

test/e2e/ingress/ingress.go

@@ -1071,19 +1071,18 @@ spec:
 
 			By("verify wss connection")
 			hostname := "api6.com"
-			conn, err := s.NewWebsocketClient(&tls.Config{
+			conn := s.NewWebsocketClient(&tls.Config{
 				InsecureSkipVerify: true,
 				ServerName:         hostname,
 			}, "/ws", http.Header{"Host": []string{hostname}})
-			Expect(err).ShouldNot(HaveOccurred(), "creating WebSocket client")
 
 			defer func() {
 				_ = conn.Close()
 			}()
 
 			By("send and receive message through WebSocket")
 			testMessage := "hello, this is APISIX"
-			err = conn.WriteMessage(websocket.TextMessage, []byte(testMessage))
+			err := conn.WriteMessage(websocket.TextMessage, []byte(testMessage))
 			Expect(err).ShouldNot(HaveOccurred(), "writing WebSocket message")
 
 			// Then our echo

test/e2e/scaffold/scaffold.go

@@ -558,7 +558,7 @@ func (s *Scaffold) GetMetricsEndpoint() string {
 	return fmt.Sprintf("http://%s/metrics", tunnel.Endpoint())
 }
 
-func (s *Scaffold) NewWebsocketClient(tls *tls.Config, path string, headers http.Header) (*websocket.Conn, error) {
+func (s *Scaffold) NewWebsocketClient(tls *tls.Config, path string, headers http.Header) *websocket.Conn {
 	var host = s.ApisixHTTPEndpoint()
 	var scheme = "ws"
 	if tls != nil {
@@ -589,5 +589,5 @@ func (s *Scaffold) NewWebsocketClient(tls *tls.Config, path string, headers http
 		conn = c
 		return nil
 	}).ShouldNot(HaveOccurred(), "establishing websocket connection")
-	return conn, nil
+	return conn
 }