Skip to content

Commit

Permalink
tests(clustering): simplify hybrid status tests (#14136)
Browse files Browse the repository at this point in the history
KAG-5994 KAG-5894
This PR will revert the changes of #14035
  • Loading branch information
chronolaw authored Jan 13, 2025
1 parent 8b65c9d commit 9c48b27
Showing 1 changed file with 1 addition and 53 deletions.
54 changes: 1 addition & 53 deletions spec/02-integration/09-hybrid_mode/11-status_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ for _, strategy in helpers.each_strategy() do
end)

-- now dp receive config from cp, so dp should be ready
local it_rpc_sync_off= rpc_sync == "off" and it or pending
it_rpc_sync_off("should return 200 on data plane after configuring", function()
it("should return 200 on data plane after configuring", function()
helpers.wait_until(function()
local http_client = helpers.http_client('127.0.0.1', dp_status_port)

Expand Down Expand Up @@ -159,57 +158,6 @@ for _, strategy in helpers.each_strategy() do
end, 10)
end)
end)

local describe_rpc_sync_on = rpc == "on" and rpc_sync == "on" and describe or pending
describe_rpc_sync_on("dp status ready when rpc_sync == on", function()
lazy_setup(function()
assert(start_kong_cp())
assert(start_kong_dp())
end)

lazy_teardown(function()
assert(helpers.stop_kong("serve_cp"))
assert(helpers.stop_kong("serve_dp"))
end)

it("should return 200 on data plane after configuring when rpc_sync == on", function()
-- insert one entity to make dp ready for incremental sync

local http_client = helpers.http_client('127.0.0.1', dp_status_port)

local res = http_client:send({
method = "GET",
path = "/status/ready",
})
http_client:close()
assert.equal(503, res.status)

local admin_client = helpers.admin_client(10000)
local res = assert(admin_client:post("/services", {
body = { name = "service-001", url = "https://127.0.0.1:15556/request", },
headers = {["Content-Type"] = "application/json"}
}))
assert.res_status(201, res)

admin_client:close()

helpers.wait_until(function()
local http_client = helpers.http_client('127.0.0.1', dp_status_port)

local res = http_client:send({
method = "GET",
path = "/status/ready",
})

local status = res and res.status
http_client:close()

if status == 200 then
return true
end
end, 10)
end)
end)
end)
end -- for _, strategy
end -- for rpc_sync

1 comment on commit 9c48b27

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bazel Build

Docker image available kong/kong:9c48b27d310492b633c4454c8c35c14aa19dffbb
Artifacts available https://github.com/Kong/kong/actions/runs/12744464766

Please sign in to comment.