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 9918efb test: solve conflict between #2993 and #2943 (#2997)
9918efb is described below
commit 9918efbe5ba8b367550a5ea64aa6de3f5183ca7f
Author: 罗泽轩 <[email protected]>
AuthorDate: Wed Dec 9 14:30:46 2020 +0800
test: solve conflict between #2993 and #2943 (#2997)
Signed-off-by: spacewander <[email protected]>
---
t/admin/routes2.t | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/admin/routes2.t b/t/admin/routes2.t
index 20bc384..d4b77f6 100644
--- a/t/admin/routes2.t
+++ b/t/admin/routes2.t
@@ -203,7 +203,7 @@ GET /t
--- request
GET /t
--- response_body
-{"action":"create","node":{"value":{"methods":["GET"],"priority":0,"upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","type":"roundrobin"},"uri":"/not_unwanted_data_post"}}}
+{"action":"create","node":{"value":{"methods":["GET"],"priority":0,"status":1,"upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","type":"roundrobin"},"uri":"/not_unwanted_data_post"}}}
--- no_error_log
[error]
@@ -245,7 +245,7 @@ GET /t
--- request
GET /t
--- response_body
-{"action":"set","node":{"key":"/apisix/routes/1","value":{"id":1,"methods":["GET"],"priority":0,"upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","type":"roundrobin"},"uri":"/index.html"}}}
+{"action":"set","node":{"key":"/apisix/routes/1","value":{"id":1,"methods":["GET"],"priority":0,"status":1,"upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","type":"roundrobin"},"uri":"/index.html"}}}
--- no_error_log
[error]
@@ -286,7 +286,7 @@ GET /t
--- request
GET /t
--- response_body
-{"action":"compareAndSwap","node":{"key":"/apisix/routes/1","value":{"id":"1","methods":["GET"],"priority":0,"upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","type":"roundrobin"},"uri":"/index"}}}
+{"action":"compareAndSwap","node":{"key":"/apisix/routes/1","value":{"id":"1","methods":["GET"],"priority":0,"status":1,"upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","type":"roundrobin"},"uri":"/index"}}}
--- no_error_log
[error]
@@ -317,7 +317,7 @@ GET /t
--- request
GET /t
--- response_body
-{"action":"get","count":"1","node":{"key":"/apisix/routes/1","value":{"id":"1","methods":["GET"],"priority":0,"upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","type":"roundrobin"},"uri":"/index"}}}
+{"action":"get","count":"1","node":{"key":"/apisix/routes/1","value":{"id":"1","methods":["GET"],"priority":0,"status":1,"upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","type":"roundrobin"},"uri":"/index"}}}
--- no_error_log
[error]
