Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests(dbless): fix flaky test #11292

Merged
merged 1 commit into from
Jul 27, 2023
Merged

tests(dbless): fix flaky test #11292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions spec/02-integration/11-dbless/03-config_persistence_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,31 +124,40 @@ describe("dbless persistence with a declarative config #off", function()
database = "off",
declarative_config = yaml_file,
}))
local proxy_client = assert(helpers.proxy_client())
ADD-SP marked this conversation as resolved.
Show resolved Hide resolved
local res = assert(proxy_client:get("/test", { headers = { host = "example1.dev" } }))
assert.res_status(401, res)

res = assert(proxy_client:get("/500", { headers = { host = "example1.dev" } }))
assert.res_status(404, res) -- 404, only the declarative config is loaded
proxy_client:close()
assert
.with_timeout(15)
.eventually(function ()
local proxy_client = helpers.proxy_client()
local res = proxy_client:get("/test", { headers = { host = "example1.dev" } })
assert.res_status(401, res) -- 401, should load the declarative config

res = proxy_client:get("/500", { headers = { host = "example1.dev" } })
assert.res_status(404, res) -- 404, should not load the persisted lmdb config

proxy_client:close()
end)
ADD-SP marked this conversation as resolved.
Show resolved Hide resolved
.has_no_error()
end)

it("doesn't load the persisted lmdb config if a declarative config is set on reload", function()
assert(helpers.reload_kong("off", "reload --prefix " .. helpers.test_conf.prefix, {
database = "off",
declarative_config = yaml_file,
}))
local res
helpers.wait_until(function()
local proxy_client = assert(helpers.proxy_client())
res = assert(proxy_client:get("/test", { headers = { host = "example1.dev" } }))
proxy_client:close()
return res.status == 401
end)

local proxy_client = assert(helpers.proxy_client())
ADD-SP marked this conversation as resolved.
Show resolved Hide resolved
res = assert(proxy_client:get("/500", { headers = { host = "example1.dev" } }))
assert.res_status(404, res) -- 404, only the declarative config is loaded
proxy_client:close()
assert
.with_timeout(15)
.eventually(function ()
local proxy_client = helpers.proxy_client()
local res = proxy_client:get("/test", { headers = { host = "example1.dev" } })
assert.res_status(401, res) -- 401, should load the declarative config

res = proxy_client:get("/500", { headers = { host = "example1.dev" } })
assert.res_status(404, res) -- 404, should not load the persisted lmdb config

proxy_client:close()
end)
.has_no_error()
end)
end)