fix tests

Author: Revolyssup

test/e2e/gatewayapi/httproute.go

@@ -153,19 +153,17 @@ spec:
 			ResourceApplied("HTTPRoute", "httpbin", exactRouteByGet, 1)
 
 			By("access dataplane to check the HTTPRoute")
-			// time.Sleep(1000000 * time.Second)
-			s.NewAPISIXClientWithHTTPS().
+			s.NewAPISIXHttpsClient("api6.com").
 				GET("/get").
 				WithHost("api6.com").
 				Expect().
 				Status(200)
-			// time.Sleep(1000 * time.Second)
 			By("delete HTTPRoute")
 			err := s.DeleteResourceFromString(exactRouteByGet)
 			Expect(err).NotTo(HaveOccurred(), "deleting HTTPRoute")
 			time.Sleep(5 * time.Second)
 
-			s.NewAPISIXClientWithHTTPS().
+			s.NewAPISIXHttpsClient("api6.com").
 				GET("/get").
 				WithHost("api6.com").
 				Expect().

test/e2e/scaffold/scaffold.go

@@ -214,26 +214,6 @@ func (s *Scaffold) NewAPISIXClient() *httpexpect.Expect {
 	})
 }
 
-// NewAPISIXClient creates the default HTTP client.
-func (s *Scaffold) NewAPISIXClientWithHTTPS() *httpexpect.Expect {
-	u := url.URL{
-		Scheme: "https",
-		Host:   s.apisixHttpsTunnel.Endpoint(),
-	}
-	return httpexpect.WithConfig(httpexpect.Config{
-		BaseURL: u.String(),
-		Client: &http.Client{
-			Transport: &http.Transport{},
-			CheckRedirect: func(req *http.Request, via []*http.Request) error {
-				return http.ErrUseLastResponse
-			},
-		},
-		Reporter: httpexpect.NewAssertReporter(
-			httpexpect.NewAssertReporter(GinkgoT()),
-		),
-	})
-}
-
 // GetAPISIXHTTPSEndpoint get apisix https endpoint from tunnel map
 func (s *Scaffold) GetAPISIXHTTPSEndpoint() string {
 	return s.apisixHttpsTunnel.Endpoint()