From 043f1e10d44e0845bf9fdf917dbf702d48b066e5 Mon Sep 17 00:00:00 2001 From: revolyssup Date: Mon, 17 Jul 2023 09:19:38 +0530 Subject: [PATCH] fix failing tests Signed-off-by: revolyssup --- apisix/admin/plugins.lua | 2 +- docs/zh/latest/admin-api.md | 2 +- t/admin/plugins.t | 6 +++--- t/admin/schema.t | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apisix/admin/plugins.lua b/apisix/admin/plugins.lua index 3b067341d736..f5e92ab0dd2f 100644 --- a/apisix/admin/plugins.lua +++ b/apisix/admin/plugins.lua @@ -83,7 +83,7 @@ function _M.get(name) if not plugin then local err = "failed to load plugin " .. name .. " in subsystem " .. subsystem core.log.warn("failed to load plugin [", name, "] err: ", err) - return 404, nil + return 404, {error_msg = "plugin not found"} end local json_schema = plugin.schema diff --git a/docs/zh/latest/admin-api.md b/docs/zh/latest/admin-api.md index 33582b944e69..ded020d05d92 100644 --- a/docs/zh/latest/admin-api.md +++ b/docs/zh/latest/admin-api.md @@ -1366,7 +1366,7 @@ Plugin 资源请求地址:/apisix/admin/plugins/{plugin_name} 你可以使用 `/apisix/admin/plugins?all=true` 接口获取所有插件的所有属性,每个插件包括 `name`,`priority`,`type`,`schema`,`consumer_schema` 和 `version`。 -您可以使用 “/apisix/admin/plugins?all=true” 获取所有插件的所有属性。这个 API 将很快被弃用 +您可以使用“/apisix/admin/plugins?all=true”获取所有插件的所有属性。这个 API 将很快被弃用 ::: diff --git a/t/admin/plugins.t b/t/admin/plugins.t index 1c4567d1b36f..ace9aadc917c 100644 --- a/t/admin/plugins.t +++ b/t/admin/plugins.t @@ -141,9 +141,9 @@ ext-plugin-post-resp === TEST 2: invalid plugin --- request GET /apisix/admin/plugins/asdf ---- error_code: 400 +--- error_code: 404 --- response_body -{"error_msg":"failed to load plugin asdf in subsystem http"} +{"error_msg":"plugin not found"} @@ -445,7 +445,7 @@ qr/\{"error_msg":"unsupported subsystem: asdf"\}/ } } --- response_body eval -qr/\{"error_msg":"failed to load plugin http-logger in subsystem stream"\}/ +qr/\{"error_msg":"plugin not found"\}/ diff --git a/t/admin/schema.t b/t/admin/schema.t index 35ac20187053..7853addd32d2 100644 --- a/t/admin/schema.t +++ b/t/admin/schema.t @@ -112,7 +112,7 @@ qr/"required":\["count","time_window"\]/ === TEST 8: get not exist plugin --- request GET /apisix/admin/schema/plugins/no-exist ---- error_code: 400 +--- error_code: 404