You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by me...@apache.org on 2021/02/04 04:48:36 UTC
[apisix] branch master updated: test: make 'not unwanted data,
GET' stable (#3513)
This is an automated email from the ASF dual-hosted git repository.
membphis 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 1d0e38a test: make 'not unwanted data, GET' stable (#3513)
1d0e38a is described below
commit 1d0e38a1d2a0ad35a6585dbbf3126888a6678d4b
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Thu Feb 4 12:48:28 2021 +0800
test: make 'not unwanted data, GET' stable (#3513)
---
t/admin/consumers2.t | 11 ++++++++---
t/admin/global-rules.t | 11 ++++++++---
t/admin/plugin-metadata.t | 7 ++++---
t/admin/routes2.t | 11 ++++++++---
t/admin/services2.t | 11 ++++++++---
t/admin/ssl2.t | 19 +++++++++++--------
t/admin/stream-routes.t | 6 +++---
t/admin/upstream2.t | 11 ++++++++---
8 files changed, 58 insertions(+), 29 deletions(-)
diff --git a/t/admin/consumers2.t b/t/admin/consumers2.t
index eda7671..2b86380 100644
--- a/t/admin/consumers2.t
+++ b/t/admin/consumers2.t
@@ -87,13 +87,18 @@ __DATA__
end
res = json.decode(res)
- res.node.value.create_time = nil
- res.node.value.update_time = nil
+ local value = res.node.value
+ assert(value.create_time ~= nil)
+ value.create_time = nil
+ assert(value.update_time ~= nil)
+ value.update_time = nil
+ assert(res.count ~= nil)
+ res.count = nil
ngx.say(json.encode(res))
}
}
--- response_body
-{"action":"get","count":"1","node":{"key":"/apisix/consumers/jack","value":{"username":"jack"}}}
+{"action":"get","node":{"key":"/apisix/consumers/jack","value":{"username":"jack"}}}
diff --git a/t/admin/global-rules.t b/t/admin/global-rules.t
index 564f2b4..001ad04 100644
--- a/t/admin/global-rules.t
+++ b/t/admin/global-rules.t
@@ -544,13 +544,18 @@ GET /t
end
res = json.decode(res)
- res.node.value.create_time = nil
- res.node.value.update_time = nil
+ local value = res.node.value
+ assert(value.create_time ~= nil)
+ value.create_time = nil
+ assert(value.update_time ~= nil)
+ value.update_time = nil
+ assert(res.count ~= nil)
+ res.count = nil
ngx.say(json.encode(res))
}
}
--- response_body
-{"action":"get","count":"1","node":{"key":"/apisix/global_rules/1","value":{"id":"1","plugins":{"proxy-rewrite":{"uri":"/"}}}}}
+{"action":"get","node":{"key":"/apisix/global_rules/1","value":{"id":"1","plugins":{"proxy-rewrite":{"uri":"/"}}}}}
--- request
GET /t
--- no_error_log
diff --git a/t/admin/plugin-metadata.t b/t/admin/plugin-metadata.t
index df3dd24..4a92f8a 100644
--- a/t/admin/plugin-metadata.t
+++ b/t/admin/plugin-metadata.t
@@ -543,13 +543,14 @@ GET /t
end
res = json.decode(res)
- res.node.value.create_time = nil
- res.node.value.update_time = nil
+ local value = res.node.value
+ assert(res.count ~= nil)
+ res.count = nil
ngx.say(json.encode(res))
}
}
--- response_body
-{"action":"get","count":"1","node":{"key":"/apisix/plugin_metadata/example-plugin","value":{"ikey":1,"skey":"val"}}}
+{"action":"get","node":{"key":"/apisix/plugin_metadata/example-plugin","value":{"ikey":1,"skey":"val"}}}
--- request
GET /t
--- no_error_log
diff --git a/t/admin/routes2.t b/t/admin/routes2.t
index cde747e..fea3f62 100644
--- a/t/admin/routes2.t
+++ b/t/admin/routes2.t
@@ -309,15 +309,20 @@ GET /t
end
res = json.decode(res)
- res.node.value.create_time = nil
- res.node.value.update_time = nil
+ local value = res.node.value
+ assert(value.create_time ~= nil)
+ value.create_time = nil
+ assert(value.update_time ~= nil)
+ value.update_time = nil
+ assert(res.count ~= nil)
+ res.count = nil
ngx.say(json.encode(res))
}
}
--- request
GET /t
--- response_body
-{"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","scheme":"http","type":"roundrobin"},"uri":"/index"}}}
+{"action":"get","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","scheme":"http","type":"roundrobin"},"uri":"/index"}}}
--- no_error_log
[error]
diff --git a/t/admin/services2.t b/t/admin/services2.t
index d9bebdf..521d603 100644
--- a/t/admin/services2.t
+++ b/t/admin/services2.t
@@ -161,13 +161,18 @@ __DATA__
end
res = json.decode(res)
- res.node.value.create_time = nil
- res.node.value.update_time = nil
+ local value = res.node.value
+ assert(value.create_time ~= nil)
+ value.create_time = nil
+ assert(value.update_time ~= nil)
+ value.update_time = nil
+ assert(res.count ~= nil)
+ res.count = nil
ngx.say(json.encode(res))
}
}
--- response_body
-{"action":"get","count":"1","node":{"key":"/apisix/services/1","value":{"id":"1","upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","scheme":"http","type":"roundrobin"}}}}
+{"action":"get","node":{"key":"/apisix/services/1","value":{"id":"1","upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","scheme":"http","type":"roundrobin"}}}}
diff --git a/t/admin/ssl2.t b/t/admin/ssl2.t
index 0c68cd2..671bd2f 100644
--- a/t/admin/ssl2.t
+++ b/t/admin/ssl2.t
@@ -145,9 +145,6 @@ __DATA__
content_by_lua_block {
local json = require("toolkit.json")
local t = require("lib.test_admin")
- local ssl_cert = t.read_file("t/certs/apisix.crt")
- local ssl_key = t.read_file("t/certs/apisix.key")
- local data = {cert = ssl_cert, key = ssl_key, sni = "test.com"}
local code, message, res = t.test('/apisix/admin/ssl/1',
ngx.HTTP_GET
)
@@ -159,15 +156,21 @@ __DATA__
end
res = json.decode(res)
- res.node.value.create_time = nil
- res.node.value.update_time = nil
- res.node.value.cert = ""
- res.node.value.key = ""
+ local value = res.node.value
+ assert(value.create_time ~= nil)
+ value.create_time = nil
+ assert(value.update_time ~= nil)
+ value.update_time = nil
+ assert(value.cert ~= nil)
+ value.cert = ""
+ assert(value.key == nil)
+ assert(res.count ~= nil)
+ res.count = nil
ngx.say(json.encode(res))
}
}
--- response_body
-{"action":"get","count":"1","node":{"key":"/apisix/ssl/1","value":{"cert":"","id":"1","key":"","sni":"t.com","status":1}}}
+{"action":"get","node":{"key":"/apisix/ssl/1","value":{"cert":"","id":"1","sni":"t.com","status":1}}}
diff --git a/t/admin/stream-routes.t b/t/admin/stream-routes.t
index 7ad1da0..013af48 100644
--- a/t/admin/stream-routes.t
+++ b/t/admin/stream-routes.t
@@ -496,13 +496,13 @@ GET /t
end
res = json.decode(res)
- res.node.value.create_time = nil
- res.node.value.update_time = nil
+ assert(res.count ~= nil)
+ res.count = nil
ngx.say(json.encode(res))
}
}
--- response_body
-{"action":"get","count":"1","node":{"key":"/apisix/stream_routes/1","value":{"id":"1","remote_addr":"127.0.0.1","upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","scheme":"http","type":"roundrobin"}}}}
+{"action":"get","node":{"key":"/apisix/stream_routes/1","value":{"id":"1","remote_addr":"127.0.0.1","upstream":{"hash_on":"vars","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","scheme":"http","type":"roundrobin"}}}}
--- request
GET /t
--- no_error_log
diff --git a/t/admin/upstream2.t b/t/admin/upstream2.t
index 3188c45..1de8381 100644
--- a/t/admin/upstream2.t
+++ b/t/admin/upstream2.t
@@ -155,13 +155,18 @@ __DATA__
end
res = json.decode(res)
- res.node.value.create_time = nil
- res.node.value.update_time = nil
+ local value = res.node.value
+ assert(value.create_time ~= nil)
+ value.create_time = nil
+ assert(value.update_time ~= nil)
+ value.update_time = nil
+ assert(res.count ~= nil)
+ res.count = nil
ngx.say(json.encode(res))
}
}
--- response_body
-{"action":"get","count":"1","node":{"key":"/apisix/upstreams/unwanted","value":{"hash_on":"vars","id":"unwanted","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","scheme":"http","type":"roundrobin"}}}
+{"action":"get","node":{"key":"/apisix/upstreams/unwanted","value":{"hash_on":"vars","id":"unwanted","nodes":{"127.0.0.1:8080":1},"pass_host":"pass","scheme":"http","type":"roundrobin"}}}