[apisix] branch master updated: test: test in TEST_NGINX_USE_HUP mode can't run after the standalone mode (#7502)

[sp...@apache.org]

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 e12989e5c test: test in TEST_NGINX_USE_HUP mode can't run after the standalone mode (#7502)
e12989e5c is described below

commit e12989e5c5086b24dd638e0f84c847ec0296dbd3
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Wed Jul 20 17:29:28 2022 +0800

    test: test in TEST_NGINX_USE_HUP mode can't run after the standalone mode (#7502)
    
    Otherwise, there will be `failed to fetch /apisix/t/servroot/conf/apisix.yaml attributes:
    cannot obtain information from file '/apisix/t/servroot/conf/apisix.yaml': No such file or directory`
    error occasionally.
    
    Signed-off-by: spacewander <sp...@gmail.com>
---
 t/plugin/prometheus.t  | 11 -----------
 t/plugin/prometheus2.t | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/t/plugin/prometheus.t b/t/plugin/prometheus.t
index 8fb2911b7..442d1b8b3 100644
--- a/t/plugin/prometheus.t
+++ b/t/plugin/prometheus.t
@@ -632,14 +632,3 @@ GET /apisix/prometheus/metrics
 qr/apisix_/
 --- response_body_unlike eval
 qr/etcd/
-
-
-
-=== TEST 42: fetch the prometheus shared dict internal-status data
---- http_config
-lua_shared_dict test-shared-dict 10m;
---- request
-GET /apisix/prometheus/metrics
---- response_body_like
-.*apisix_shared_dict_capacity_bytes{name="test-shared-dict"} 10485760(?:.|\n)*
-apisix_shared_dict_free_space_bytes{name="test-shared-dict"} \d+.*
diff --git a/t/plugin/prometheus2.t b/t/plugin/prometheus2.t
index a2715d6d6..5dc1e1a17 100644
--- a/t/plugin/prometheus2.t
+++ b/t/plugin/prometheus2.t
@@ -914,3 +914,14 @@ GET /hello
 GET /apisix/prometheus/metrics
 --- response_body eval
 qr/apisix_bandwidth\{type="egress",route="1",service="service_name",consumer="",node="127.0.0.1"\} \d+/
+
+
+
+=== TEST 50: fetch the prometheus shared dict data
+--- http_config
+lua_shared_dict test-shared-dict 10m;
+--- request
+GET /apisix/prometheus/metrics
+--- response_body_like
+.*apisix_shared_dict_capacity_bytes{name="test-shared-dict"} 10485760(?:.|\n)*
+apisix_shared_dict_free_space_bytes{name="test-shared-dict"} \d+.*