You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by bz...@apache.org on 2021/10/15 01:25:33 UTC

[apisix-dashboard] branch master updated: test: fix ginkgo E2E crash (#2173)

This is an automated email from the ASF dual-hosted git repository.

bzp2010 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 5065c65  test: fix ginkgo E2E crash (#2173)
5065c65 is described below

commit 5065c65097bf0209e0942142afa2bcb72b9eb174
Author: bzp2010 <bz...@apache.org>
AuthorDate: Thu Oct 14 20:25:27 2021 -0500

    test: fix ginkgo E2E crash (#2173)
    
    * test: fix ginkgo E2E crash
    * test: update SSL test
    * test: re add plugin_config bad query case
---
 .github/workflows/backend-e2e-test.yml              | 4 ++--
 api/test/e2enew/plugin_config/plugin_config_test.go | 4 ++--
 api/test/e2enew/ssl/ssl_test.go                     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/backend-e2e-test.yml b/.github/workflows/backend-e2e-test.yml
index f5d4b92..ba8d43d 100644
--- a/.github/workflows/backend-e2e-test.yml
+++ b/.github/workflows/backend-e2e-test.yml
@@ -138,7 +138,7 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v2.1.4
         with:
-          go-version: "1.13"
+          go-version: "1.17"
 
       - uses: docker/setup-buildx-action@v1
 
@@ -179,7 +179,7 @@ jobs:
           docker logs docker_managerapi_1
 
       - name: install ginkgo cli
-        run: go get github.com/onsi/ginkgo/ginkgo
+        run: go install github.com/onsi/ginkgo/ginkgo@v1.16.5
 
       - name: run test
         working-directory: ./api/test/e2enew
diff --git a/api/test/e2enew/plugin_config/plugin_config_test.go b/api/test/e2enew/plugin_config/plugin_config_test.go
index 2109a91..4f69813 100644
--- a/api/test/e2enew/plugin_config/plugin_config_test.go
+++ b/api/test/e2enew/plugin_config/plugin_config_test.go
@@ -144,7 +144,7 @@ var _ = ginkgo.Describe("Plugin Config", func() {
 			Object:        base.APISIXExpect(),
 			Method:        http.MethodGet,
 			Path:          "/hello",
-			Query:         "name=;select%20from%20sys",
+			Query:         "name=%3Bselect%20from%20sys",
 			ExpectStatus:  http.StatusForbidden,
 			ExpectHeaders: map[string]string{"X-VERSION": "1.0"},
 			Sleep:         base.SleepTime,
@@ -181,7 +181,7 @@ var _ = ginkgo.Describe("Plugin Config", func() {
 			Object:        base.APISIXExpect(),
 			Method:        http.MethodGet,
 			Path:          "/hello",
-			Query:         "name=;select%20from%20sys",
+			Query:         "name=%3Bselect%20from%20sys",
 			ExpectStatus:  http.StatusOK,
 			ExpectBody:    "hello world",
 			ExpectHeaders: map[string]string{"X-VERSION": "2.0"},
diff --git a/api/test/e2enew/ssl/ssl_test.go b/api/test/e2enew/ssl/ssl_test.go
index bd1fa43..e201982 100644
--- a/api/test/e2enew/ssl/ssl_test.go
+++ b/api/test/e2enew/ssl/ssl_test.go
@@ -112,7 +112,7 @@ var _ = ginkgo.Describe("SSL Basic", func() {
 		}
 
 		_, err := http.Get("https://www.test2.com:9443")
-		gomega.Expect(fmt.Sprintf("%s", err)).Should(gomega.Equal("Get https://www.test2.com:9443: remote error: tls: internal error"))
+		gomega.Expect(fmt.Sprintf("%s", err)).Should(gomega.Equal("Get \"https://www.test2.com:9443\": remote error: tls: internal error"))
 	})
 
 	table.DescribeTable("test ssl basic", func(testCase base.HttpTestCase) {
@@ -240,7 +240,7 @@ var _ = ginkgo.Describe("SSL Basic", func() {
 		// try again after disable SSL, make a HTTPS request
 		time.Sleep(time.Duration(500) * time.Millisecond)
 		_, err := http.Get("https://www.test2.com:9443")
-		gomega.Expect(fmt.Sprintf("%s", err)).Should(gomega.Equal("Get https://www.test2.com:9443: remote error: tls: internal error"))
+		gomega.Expect(fmt.Sprintf("%s", err)).Should(gomega.Equal("Get \"https://www.test2.com:9443\": remote error: tls: internal error"))
 	})
 
 	table.DescribeTable("test ssl basic", func(testCase base.HttpTestCase) {