This is an automated email from the ASF dual-hosted git repository.
tzssangglass pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/apisix-java-plugin-runner.git
The following commit(s) were added to refs/heads/main by this push:
new 88e341e ci: sync APISIX use 9180 as default port of admin API (#197)
88e341e is described below
commit 88e341e52a5ffba02f41763855b75b3755937da5
Author: tzssangglass <[email protected]>
AuthorDate: Fri Sep 2 11:03:02 2022 +0800
ci: sync APISIX use 9180 as default port of admin API (#197)
---
ci/docker-compose.yml | 1 +
tests/e2e/plugins/plugins_post_test.go | 2 +-
tests/e2e/plugins/plugins_rewrite_test.go | 2 +-
tests/e2e/plugins/plugins_stop_test.go | 2 +-
tests/e2e/tools/tools.go | 12 +++++++++---
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
index b0c838a..b0da709 100644
--- a/ci/docker-compose.yml
+++ b/ci/docker-compose.yml
@@ -28,6 +28,7 @@ services:
- etcd
ports:
- "9080:9080/tcp"
+ - "9180:9180/tcp"
- "9091:9091/tcp"
- "9443:9443/tcp"
- "9092:9092/tcp"
diff --git a/tests/e2e/plugins/plugins_post_test.go
b/tests/e2e/plugins/plugins_post_test.go
index 4e472c9..65731cf 100644
--- a/tests/e2e/plugins/plugins_post_test.go
+++ b/tests/e2e/plugins/plugins_post_test.go
@@ -32,7 +32,7 @@ var _ = ginkgo.Describe("Post", func() {
tools.RunTestCase(tc)
},
table.Entry("create java runner post plugin route success",
tools.HttpTestCase{
- Object: tools.GetA6Expect(),
+ Object: tools.PutA6Conf(),
Method: http.MethodPut,
Path: "/apisix/admin/routes/1",
Body: `{
diff --git a/tests/e2e/plugins/plugins_rewrite_test.go
b/tests/e2e/plugins/plugins_rewrite_test.go
index a6d2c8d..3f1be85 100644
--- a/tests/e2e/plugins/plugins_rewrite_test.go
+++ b/tests/e2e/plugins/plugins_rewrite_test.go
@@ -31,7 +31,7 @@ var _ = ginkgo.Describe("Stop", func() {
tools.RunTestCase(tc)
},
table.Entry("create java runner stop plugin route success",
tools.HttpTestCase{
- Object: tools.GetA6Expect(),
+ Object: tools.PutA6Conf(),
Method: http.MethodPut,
Path: "/apisix/admin/routes/1",
Body: `{
diff --git a/tests/e2e/plugins/plugins_stop_test.go
b/tests/e2e/plugins/plugins_stop_test.go
index 87ea5dc..16f7e70 100644
--- a/tests/e2e/plugins/plugins_stop_test.go
+++ b/tests/e2e/plugins/plugins_stop_test.go
@@ -32,7 +32,7 @@ var _ = ginkgo.Describe("Stop", func() {
tools.RunTestCase(tc)
},
table.Entry("create java runner stop plugin route success",
tools.HttpTestCase{
- Object: tools.GetA6Expect(),
+ Object: tools.PutA6Conf(),
Method: http.MethodPut,
Path: "/apisix/admin/routes/1",
Body: `{
diff --git a/tests/e2e/tools/tools.go b/tests/e2e/tools/tools.go
index 064d93b..b657c82 100644
--- a/tests/e2e/tools/tools.go
+++ b/tests/e2e/tools/tools.go
@@ -26,17 +26,23 @@ import (
)
var (
- token = "edd1c9f034335f136f87ad84b625c8f1"
- A6Host = "http://127.0.0.1:9080";
+ token = "edd1c9f034335f136f87ad84b625c8f1"
+ A6_CP_Host = "http://127.0.0.1:9180";
+ A6_DP_Host = "http://127.0.0.1:9080";
)
func GetAdminToken() string {
return token
}
+func PutA6Conf() *httpexpect.Expect {
+ t := ginkgo.GinkgoT()
+ return httpexpect.New(t, A6_CP_Host)
+}
+
func GetA6Expect() *httpexpect.Expect {
t := ginkgo.GinkgoT()
- return httpexpect.New(t, A6Host)
+ return httpexpect.New(t, A6_DP_Host)
}
type HttpTestCase struct {
