You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by le...@apache.org on 2023/05/11 07:52:22 UTC
[apisix] branch master updated: test: remove duplicate `proto` unit test file and tweak test case title (#9445)
This is an automated email from the ASF dual-hosted git repository.
leslie 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 4df67233f test: remove duplicate `proto` unit test file and tweak test case title (#9445)
4df67233f is described below
commit 4df67233f03fd780f3b775c21b36aae4462a3285
Author: Traky Deng <tr...@gmail.com>
AuthorDate: Thu May 11 15:52:11 2023 +0800
test: remove duplicate `proto` unit test file and tweak test case title (#9445)
---
t/admin/proto.t | 216 -------------------------------------------------------
t/admin/protos.t | 141 +++++++++++++++++++++++++++++++++++-
2 files changed, 140 insertions(+), 217 deletions(-)
diff --git a/t/admin/proto.t b/t/admin/proto.t
deleted file mode 100644
index e560ffffc..000000000
--- a/t/admin/proto.t
+++ /dev/null
@@ -1,216 +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_long_string();
-no_root_location();
-no_shuffle();
-log_level("info");
-
-add_block_preprocessor(sub {
- my ($block) = @_;
-
- if (!$block->request) {
- $block->set_value("request", "GET /t");
- }
-
- if (!$block->no_error_log && !$block->error_log) {
- $block->set_value("no_error_log", "[error]\n[alert]");
- }
-});
-
-run_tests;
-
-__DATA__
-
-=== TEST 1: put proto (id:1)
---- config
- location /t {
- content_by_lua_block {
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/protos/1',
- ngx.HTTP_PUT,
- [[{
- "content": "syntax = \"proto3\";
- package proto;
- message HelloRequest{
- string name = 1;
- }
-
- message HelloResponse{
- int32 code = 1;
- string msg = 2;
- }
- // The greeting service definition.
- service Hello {
- // Sends a greeting
- rpc SayHi (HelloRequest) returns (HelloResponse){}
- }"
- }]]
- )
-
- if code ~= 201 then
- ngx.status = code
- ngx.say("[put proto] code: ", code, " message: ", message)
- return
- end
-
- ngx.say("[put proto] code: ", code, " message: ", message)
- }
- }
---- response_body
-[put proto] code: 201 message: passed
-
-
-
-=== TEST 2: delete proto(id:1)
---- config
- location /t {
- content_by_lua_block {
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/protos/1',
- ngx.HTTP_DELETE
- )
-
- if code ~= 200 then
- ngx.status = code
- ngx.say("[delete proto] code: ", code, " message: ", message)
- return
- end
-
- ngx.say("[delete proto] code: ", code, " message: ", message)
- }
- }
---- response_body
-[delete proto] code: 200 message: passed
-
-
-
-=== TEST 3: put proto (id:2) + route refer proto(proto id 2) + delete proto(proto id 2)
---- config
- location /t {
- content_by_lua_block {
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/protos/2',
- ngx.HTTP_PUT,
- [[{
- "content": "syntax = \"proto3\";
- package proto;
- message HelloRequest{
- string name = 1;
- }
-
- message HelloResponse{
- int32 code = 1;
- string msg = 2;
- }
- // The greeting service definition.
- service Hello {
- // Sends a greeting
- rpc SayHi (HelloRequest) returns (HelloResponse){}
- }"
- }]]
- )
-
- if code ~= 201 then
- ngx.status = code
- ngx.say("[put proto] code: ", code, " message: ", message)
- return
- end
- ngx.say("[put proto] code: ", code, " message: ", message)
-
-
- code, message = t('/apisix/admin/routes/2',
- ngx.HTTP_PUT,
- [[{
- "methods": ["GET"],
- "plugins": {
- "grpc-transcode": {
- "_meta": {
- "disable": false
- },
- "method": "SayHi",
- "proto_id": 2,
- "service": "proto.Hello"
- }
- },
- "upstream": {
- "nodes": {
- "127.0.0.1:8080": 1
- },
- "type": "roundrobin"
- },
- "uri": "/grpc/sayhi",
- "name": "hi-grpc"
- }]]
- )
-
- if code ~= 201 then
- ngx.status = code
- ngx.say("[route refer proto] code: ", code, " message: ", message)
- return
- end
- ngx.say("[route refer proto] code: ", code, " message: ", message)
-
- ngx.sleep(0.1) -- ensure reference is synced from etcd
-
- code, message = t('/apisix/admin/protos/2',
- ngx.HTTP_DELETE
- )
-
- ngx.say("[delete proto] code: ", code)
- }
- }
---- response_body
-[put proto] code: 201 message: passed
-[route refer proto] code: 201 message: passed
-[delete proto] code: 400
-
-
-
-=== TEST 4: reject invalid proto
---- config
- location /t {
- content_by_lua_block {
- local t = require("lib.test_admin").test
- local code, message = t('/apisix/admin/protos/1',
- ngx.HTTP_PUT,
- [[{
- "content": "syntax = \"proto3\";
- package proto;
- message HelloRequest{
- string name = 1;
- }
-
- message HelloResponse{
- int32 code = 1;
- string msg = 1;
- }"
- }]]
- )
-
- if code ~= 200 then
- ngx.status = code
- end
-
- ngx.say(message)
- }
- }
---- error_code: 400
---- response_body eval
-qr/invalid content:/
diff --git a/t/admin/protos.t b/t/admin/protos.t
index 320c6179e..e560ffffc 100644
--- a/t/admin/protos.t
+++ b/t/admin/protos.t
@@ -38,7 +38,7 @@ run_tests;
__DATA__
-=== TEST 1: test /apisix/admin/protos/{id}
+=== TEST 1: put proto (id:1)
--- config
location /t {
content_by_lua_block {
@@ -75,3 +75,142 @@ __DATA__
}
--- response_body
[put proto] code: 201 message: passed
+
+
+
+=== TEST 2: delete proto(id:1)
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/protos/1',
+ ngx.HTTP_DELETE
+ )
+
+ if code ~= 200 then
+ ngx.status = code
+ ngx.say("[delete proto] code: ", code, " message: ", message)
+ return
+ end
+
+ ngx.say("[delete proto] code: ", code, " message: ", message)
+ }
+ }
+--- response_body
+[delete proto] code: 200 message: passed
+
+
+
+=== TEST 3: put proto (id:2) + route refer proto(proto id 2) + delete proto(proto id 2)
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/protos/2',
+ ngx.HTTP_PUT,
+ [[{
+ "content": "syntax = \"proto3\";
+ package proto;
+ message HelloRequest{
+ string name = 1;
+ }
+
+ message HelloResponse{
+ int32 code = 1;
+ string msg = 2;
+ }
+ // The greeting service definition.
+ service Hello {
+ // Sends a greeting
+ rpc SayHi (HelloRequest) returns (HelloResponse){}
+ }"
+ }]]
+ )
+
+ if code ~= 201 then
+ ngx.status = code
+ ngx.say("[put proto] code: ", code, " message: ", message)
+ return
+ end
+ ngx.say("[put proto] code: ", code, " message: ", message)
+
+
+ code, message = t('/apisix/admin/routes/2',
+ ngx.HTTP_PUT,
+ [[{
+ "methods": ["GET"],
+ "plugins": {
+ "grpc-transcode": {
+ "_meta": {
+ "disable": false
+ },
+ "method": "SayHi",
+ "proto_id": 2,
+ "service": "proto.Hello"
+ }
+ },
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:8080": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/grpc/sayhi",
+ "name": "hi-grpc"
+ }]]
+ )
+
+ if code ~= 201 then
+ ngx.status = code
+ ngx.say("[route refer proto] code: ", code, " message: ", message)
+ return
+ end
+ ngx.say("[route refer proto] code: ", code, " message: ", message)
+
+ ngx.sleep(0.1) -- ensure reference is synced from etcd
+
+ code, message = t('/apisix/admin/protos/2',
+ ngx.HTTP_DELETE
+ )
+
+ ngx.say("[delete proto] code: ", code)
+ }
+ }
+--- response_body
+[put proto] code: 201 message: passed
+[route refer proto] code: 201 message: passed
+[delete proto] code: 400
+
+
+
+=== TEST 4: reject invalid proto
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/protos/1',
+ ngx.HTTP_PUT,
+ [[{
+ "content": "syntax = \"proto3\";
+ package proto;
+ message HelloRequest{
+ string name = 1;
+ }
+
+ message HelloResponse{
+ int32 code = 1;
+ string msg = 1;
+ }"
+ }]]
+ )
+
+ if code ~= 200 then
+ ngx.status = code
+ end
+
+ ngx.say(message)
+ }
+ }
+--- error_code: 400
+--- response_body eval
+qr/invalid content:/