You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2022/01/17 11:11:30 UTC
[apisix] branch master updated: test: merge the delete-* cases into admin group cases (#6121)
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new ebf6222 test: merge the delete-* cases into admin group cases (#6121)
ebf6222 is described below
commit ebf622242a7b3379ded40cec82ce0923e292a67b
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Mon Jan 17 19:11:19 2022 +0800
test: merge the delete-* cases into admin group cases (#6121)
---
t/admin/delete-service.t | 171 -----------------------------------
t/admin/delete-upstream.t | 224 ----------------------------------------------
t/admin/services2.t | 109 ++++++++++++++++++++++
t/admin/upstream4.t | 147 ++++++++++++++++++++++++++++++
4 files changed, 256 insertions(+), 395 deletions(-)
diff --git a/t/admin/delete-service.t b/t/admin/delete-service.t
deleted file mode 100644
index 2deb44a..0000000
--- a/t/admin/delete-service.t
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-use t::APISIX 'no_plan';
-
-repeat_each(1);
-no_root_location();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: set service(id: 1)
---- config
- location /t {
- content_by_lua_block {
- local t = require("lib.test_admin").test
- local code, body = t('/apisix/admin/services/1',
- ngx.HTTP_PUT,
- [[{
- "upstream": {
- "nodes": {
- "127.0.0.1:8080": 1
- },
- "type": "roundrobin"
- }
- }]],
- [[{
- "node": {
- "value": {
- "upstream": {
- "nodes": {
- "127.0.0.1:8080": 1
- },
- "type": "roundrobin"
- }
- },
- "key": "/apisix/services/1"
- },
- "action": "set"
- }]]
- )
-
- ngx.status = code
- ngx.say(body)
- }
- }
---- request
-GET /t
---- response_body
-passed
---- no_error_log
-[error]
-
-
-
-=== TEST 2: set route(id: 1)
---- config
- location /t {
- content_by_lua_block {
- local t = require("lib.test_admin").test
- local code, body = t('/apisix/admin/routes/1',
- ngx.HTTP_PUT,
- [[{
- "service_id": 1,
- "uri": "/index.html"
- }]],
- [[{
- "node": {
- "value": {
- "service_id": 1,
- "uri": "/index.html"
- },
- "key": "/apisix/routes/1"
- },
- "action": "set"
- }]]
- )
-
- ngx.status = code
- ngx.say(body)
- }
- }
---- request
-GET /t
---- response_body
-passed
---- no_error_log
-[error]
-
-
-
-=== TEST 3: delete service(id: 1)
---- config
- location /t {
- content_by_lua_block {
- ngx.sleep(0.3)
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/services/1',
- ngx.HTTP_DELETE,
- nil,
- [[{"action": "delete"}]]
- )
- ngx.print("[delete] code: ", code, " message: ", message)
- }
- }
---- request
-GET /t
---- response_body
-[delete] code: 400 message: {"error_msg":"can not delete this service directly, route [1] is still using it now"}
---- no_error_log
-[error]
-
-
-
-=== TEST 4: delete route(id: 1)
---- config
- location /t {
- content_by_lua_block {
- ngx.sleep(0.3)
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/routes/1',
- ngx.HTTP_DELETE,
- nil,
- [[{"action": "delete"}]]
- )
- ngx.say("[delete] code: ", code, " message: ", message)
- }
- }
---- request
-GET /t
---- response_body
-[delete] code: 200 message: passed
---- no_error_log
-[error]
-
-
-
-=== TEST 5: delete service(id: 1)
---- config
- location /t {
- content_by_lua_block {
- ngx.sleep(0.3)
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/services/1',
- ngx.HTTP_DELETE,
- nil,
- [[{"action": "delete"}]]
- )
- ngx.say("[delete] code: ", code, " message: ", message)
- }
- }
---- request
-GET /t
---- response_body
-[delete] code: 200 message: passed
---- no_error_log
-[error]
diff --git a/t/admin/delete-upstream.t b/t/admin/delete-upstream.t
deleted file mode 100644
index 4b7384d..0000000
--- a/t/admin/delete-upstream.t
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-use t::APISIX 'no_plan';
-
-repeat_each(1);
-no_root_location();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: set upstream(id: 1)
---- config
- location /t {
- content_by_lua_block {
- local t = require("lib.test_admin").test
- local code, body = t('/apisix/admin/upstreams/1',
- ngx.HTTP_PUT,
- [[{
- "nodes": {
- "127.0.0.1:8080": 1
- },
- "type": "roundrobin"
- }]],
- [[{
- "node": {
- "value": {
- "nodes": {
- "127.0.0.1:8080": 1
- },
- "type": "roundrobin"
- },
- "key": "/apisix/upstreams/1"
- },
- "action": "set"
- }]]
- )
-
- ngx.status = code
- ngx.say(body)
- }
- }
---- request
-GET /t
---- response_body
-passed
---- no_error_log
-[error]
-
-
-
-=== TEST 2: set service(id: 1)
---- config
- location /t {
- content_by_lua_block {
- local t = require("lib.test_admin").test
- local code, body = t('/apisix/admin/services/1',
- ngx.HTTP_PUT,
- [[{
- "upstream_id": 1
- }]],
- [[{
- "node": {
- "value": {
- "upstream_id": 1
- },
- "key": "/apisix/services/1"
- },
- "action": "set"
- }]]
- )
-
- ngx.status = code
- ngx.say(body)
- }
- }
---- request
-GET /t
---- response_body
-passed
---- no_error_log
-[error]
-
-
-
-=== TEST 3: set route(id: 1)
---- config
- location /t {
- content_by_lua_block {
- local t = require("lib.test_admin").test
- local code, body = t('/apisix/admin/routes/1',
- ngx.HTTP_PUT,
- [[{
- "upstream_id": 1,
- "uri": "/index.html"
- }]],
- [[{
- "node": {
- "value": {
- "upstream_id": 1,
- "uri": "/index.html"
- },
- "key": "/apisix/routes/1"
- },
- "action": "set"
- }]]
- )
-
- ngx.status = code
- ngx.say(body)
- }
- }
---- request
-GET /t
---- response_body
-passed
---- no_error_log
-[error]
-
-
-
-=== TEST 4: delete upstream(id: 1)
---- config
- location /t {
- content_by_lua_block {
- ngx.sleep(0.3)
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/upstreams/1',
- ngx.HTTP_DELETE,
- nil,
- [[{"action": "delete"}]]
- )
- ngx.print("[delete] code: ", code, " message: ", message)
- }
- }
---- request
-GET /t
---- response_body
-[delete] code: 400 message: {"error_msg":"can not delete this upstream, route [1] is still using it now"}
---- no_error_log
-[error]
-
-
-
-=== TEST 5: delete route(id: 1)
---- config
- location /t {
- content_by_lua_block {
- ngx.sleep(0.3)
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/routes/1',
- ngx.HTTP_DELETE,
- nil,
- [[{"action": "delete"}]]
- )
- ngx.say("[delete] code: ", code, " message: ", message)
- }
- }
---- request
-GET /t
---- response_body
-[delete] code: 200 message: passed
---- no_error_log
-[error]
-
-
-
-=== TEST 6: delete service(id: 1)
---- config
- location /t {
- content_by_lua_block {
- ngx.sleep(0.3)
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/services/1',
- ngx.HTTP_DELETE,
- nil,
- [[{"action": "delete"}]]
- )
- ngx.say("[delete] code: ", code, " message: ", message)
- }
- }
---- request
-GET /t
---- response_body
-[delete] code: 200 message: passed
---- no_error_log
-[error]
-
-
-
-=== TEST 7: delete upstream(id: 1)
---- config
- location /t {
- content_by_lua_block {
- ngx.sleep(0.3)
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/upstreams/1',
- ngx.HTTP_DELETE,
- nil,
- [[{"action": "delete"}]]
- )
- ngx.say("[delete] code: ", code, " message: ", message)
- }
- }
---- request
-GET /t
---- response_body
-[delete] code: 200 message: passed
---- no_error_log
-[error]
diff --git a/t/admin/services2.t b/t/admin/services2.t
index d7fd3c1..9cbe8e7 100644
--- a/t/admin/services2.t
+++ b/t/admin/services2.t
@@ -200,3 +200,112 @@ __DATA__
}
--- response_body
{"action":"delete","deleted":"1","key":"/apisix/services/1","node":{}}
+
+
+
+=== TEST 6: set service(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/services/1',
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:8080": 1
+ },
+ "type": "roundrobin"
+ }
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- response_body
+passed
+
+
+
+=== TEST 7: set route(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "service_id": 1,
+ "uri": "/index.html"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- response_body
+passed
+
+
+
+=== TEST 8: delete service(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ ngx.sleep(0.3)
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/services/1',
+ ngx.HTTP_DELETE,
+ nil,
+ [[{"action": "delete"}]]
+ )
+ ngx.print("[delete] code: ", code, " message: ", message)
+ }
+ }
+--- response_body
+[delete] code: 400 message: {"error_msg":"can not delete this service directly, route [1] is still using it now"}
+
+
+
+=== TEST 9: delete route(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ ngx.sleep(0.3)
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/routes/1',
+ ngx.HTTP_DELETE,
+ nil,
+ [[{"action": "delete"}]]
+ )
+ ngx.say("[delete] code: ", code, " message: ", message)
+ }
+ }
+--- response_body
+[delete] code: 200 message: passed
+
+
+
+=== TEST 10: delete service(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ ngx.sleep(0.3)
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/services/1',
+ ngx.HTTP_DELETE,
+ nil,
+ [[{"action": "delete"}]]
+ )
+ ngx.say("[delete] code: ", code, " message: ", message)
+ }
+ }
+--- response_body
+[delete] code: 200 message: passed
diff --git a/t/admin/upstream4.t b/t/admin/upstream4.t
index 1fc3004..1f55fc9 100644
--- a/t/admin/upstream4.t
+++ b/t/admin/upstream4.t
@@ -603,3 +603,150 @@ passed
assert(prev_update_time ~= update_time, "update_time should be changed")
}
}
+
+
+
+=== TEST 18: set upstream(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/upstreams/1',
+ ngx.HTTP_PUT,
+ [[{
+ "nodes": {
+ "127.0.0.1:8080": 1
+ },
+ "type": "roundrobin"
+ }]]
+ )
+
+ ngx.status = code
+ ngx.say(body)
+ }
+ }
+--- response_body
+passed
+
+
+
+=== TEST 19: set service(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/services/1',
+ ngx.HTTP_PUT,
+ [[{
+ "upstream_id": 1
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- response_body
+passed
+
+
+
+=== TEST 20: set route(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "upstream_id": 1,
+ "uri": "/index.html"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- response_body
+passed
+
+
+
+=== TEST 21: delete upstream(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ ngx.sleep(0.3)
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/upstreams/1',
+ ngx.HTTP_DELETE,
+ nil,
+ [[{"action": "delete"}]]
+ )
+ ngx.print("[delete] code: ", code, " message: ", message)
+ }
+ }
+--- response_body
+[delete] code: 400 message: {"error_msg":"can not delete this upstream, route [1] is still using it now"}
+
+
+
+=== TEST 22: delete route(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ ngx.sleep(0.3)
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/routes/1',
+ ngx.HTTP_DELETE,
+ nil,
+ [[{"action": "delete"}]]
+ )
+ ngx.say("[delete] code: ", code, " message: ", message)
+ }
+ }
+--- response_body
+[delete] code: 200 message: passed
+
+
+
+=== TEST 23: delete service(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ ngx.sleep(0.3)
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/services/1',
+ ngx.HTTP_DELETE,
+ nil,
+ [[{"action": "delete"}]]
+ )
+ ngx.say("[delete] code: ", code, " message: ", message)
+ }
+ }
+--- response_body
+[delete] code: 200 message: passed
+
+
+
+=== TEST 24: delete upstream(id: 1)
+--- config
+ location /t {
+ content_by_lua_block {
+ ngx.sleep(0.3)
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/upstreams/1',
+ ngx.HTTP_DELETE,
+ nil,
+ [[{"action": "delete"}]]
+ )
+ ngx.say("[delete] code: ", code, " message: ", message)
+ }
+ }
+--- response_body
+[delete] code: 200 message: passed