DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
Bo0km4n 2020-06-20 17:13:31 +09:00
commit 7ab0916c92
161 changed files with 2159 additions and 1223 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rootfs/etc/nginx/lua/test/monitor_test.lua
View file

@ -1,4 +1,3 @@
_G._TEST = true
local original_ngx = ngx
local function reset_ngx()
@ -31,8 +30,8 @@ describe("Monitor", function()
end)
it("extended batch size", function()
local monitor = require("monitor")
mock_ngx({ var = {} })
local monitor = require("monitor")
monitor.set_metrics_max_batch_size(20000)
for i = 1,20000,1 do
@ -43,8 +42,8 @@ describe("Monitor", function()
end)
it("batches metrics", function()
local monitor = require("monitor")
mock_ngx({ var = {} })
local monitor = require("monitor")
for i = 1,10,1 do
monitor.call()
@ -56,8 +55,8 @@ describe("Monitor", function()
describe("flush", function()
it("short circuits when premmature is true (when worker is shutting down)", function()
local tcp_mock = mock_ngx_socket_tcp()
local monitor = require("monitor")
mock_ngx({ var = {} })
local monitor = require("monitor")
for i = 1,10,1 do
monitor.call()
@ -76,7 +75,6 @@ describe("Monitor", function()
it("JSON encodes and sends the batched metrics", function()
local tcp_mock = mock_ngx_socket_tcp()
local monitor = require("monitor")
local ngx_var_mock = {
host = "example.com",
@ -98,6 +96,7 @@ describe("Monitor", function()
upstream_status = "200",
}
mock_ngx({ var = ngx_var_mock })
local monitor = require("monitor")
monitor.call()
local ngx_var_mock1 = ngx_var_mock