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

fix flaky lua tests

Browse source
This commit is contained in:
Elvin Efendi 2020-12-10 22:41:41 -05:00
parent 5bd066463e
commit 1e9650a0f9
2 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rootfs/etc/nginx/lua/test/configuration_test.lua
View file

@ -6,7 +6,7 @@ local certificate_data = ngx.shared.certificate_data
local certificate_servers = ngx.shared.certificate_servers
local ocsp_response_cache = ngx.shared.ocsp_response_cache
function get_backends()
local function get_backends()
return {
{
name = "my-dummy-backend-1", ["load-balance"] = "sticky",
@ -30,7 +30,7 @@ function get_backends()
}
end
function get_mocked_ngx_env()
local function get_mocked_ngx_env()
local _ngx = {
status = ngx.HTTP_OK,
var = {},
@ -281,9 +281,7 @@ describe("Configuration", function()
local s = spy.on(ngx, "log")
assert.has_no.errors(configuration.handle_servers)
assert.spy(s).was_called_with(ngx.ERR,
string.format("error setting certificate for %s: error\nerror setting certificate for %s: error\n", UUID, uuid2))
assert.same(ngx.status, ngx.HTTP_INTERNAL_SERVER_ERROR)
assert.same(ngx.HTTP_INTERNAL_SERVER_ERROR, ngx.status)
end)
it("logs a warning when entry is forcibly stored", function()

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

@ -1,3 +1,4 @@
local cjson = require("cjson.safe")
local original_ngx = ngx
local function reset_ngx()
@ -107,7 +108,42 @@ describe("Monitor", function()
monitor.flush()
local expected_payload = '[{"requestLength":256,"ingress":"example","status":"200","service":"http-svc","requestTime":0.04,"namespace":"default","host":"example.com","method":"GET","upstreamResponseTime":0.02,"upstreamResponseLength":456,"upstreamLatency":0.01,"path":"\\/","responseLength":512},{"requestLength":256,"ingress":"example","status":"201","service":"http-svc","requestTime":0.04,"namespace":"default","host":"example.com","method":"POST","upstreamResponseTime":0.02,"upstreamResponseLength":456,"upstreamLatency":0.01,"path":"\\/","responseLength":512}]'
local expected_payload = cjson.encode({
{
host = "example.com",
namespace = "default",
ingress = "example",
service = "http-svc",
path = "/",
method = "GET",
status = "200",
requestLength = 256,
requestTime = 0.04,
responseLength = 512,
upstreamLatency = 0.01,
upstreamResponseTime = 0.02,
upstreamResponseLength = 456,
},
{
host = "example.com",
namespace = "default",
ingress = "example",
service = "http-svc",
path = "/",
method = "POST",
status = "201",
requestLength = 256,
requestTime = 0.04,
responseLength = 512,
upstreamLatency = 0.01,
upstreamResponseTime = 0.02,
upstreamResponseLength = 456,
},
})
assert.stub(tcp_mock.connect).was_called_with(tcp_mock, "unix:/tmp/prometheus-nginx.socket")
assert.stub(tcp_mock.send).was_called_with(tcp_mock, expected_payload)