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.

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(clustering): enable incremental sync in hybrid mode #13914

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
3 changes: 1 addition & 2 deletions spec/02-integration/07-sdk/03-cluster_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ fixtures_cp.http_mock.my_server_block = [[
}
]]

-- TODO: reenable the inc sync test
for _, inc_sync in ipairs { "off" } do
for _, inc_sync in ipairs { "on", "off" } do
for _, strategy in helpers.each_strategy() do
describe("PDK: kong.cluster for #" .. strategy .. " inc_sync=" .. inc_sync, function()
local proxy_client
Expand Down
3 changes: 1 addition & 2 deletions spec/02-integration/09-hybrid_mode/01-sync_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ local uuid = require("kong.tools.uuid").uuid
local KEY_AUTH_PLUGIN


--- XXX FIXME: enable incremental sync "on"
for _, inc_sync in ipairs { "off" } do
for _, inc_sync in ipairs { "on", "off" } do
for _, strategy in helpers.each_strategy() do

--- XXX FIXME: enable inc_sync = on
Expand Down
3 changes: 1 addition & 2 deletions spec/02-integration/09-hybrid_mode/03-pki_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ local helpers = require "spec.helpers"
local cjson = require "cjson.safe"


-- TODO: reenable the inc sync test
for _, inc_sync in ipairs { "off" } do
for _, inc_sync in ipairs { "on", "off" } do
for _, strategy in helpers.each_strategy() do

describe("CP/DP PKI sync #" .. strategy .. " inc_sync=" .. inc_sync, function()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ local function find_in_file(filepath, pat)
end


-- TODO: reenable the inc sync test
for _, inc_sync in ipairs { "off" } do
for _, inc_sync in ipairs { "on", "off" } do
for _, strategy in helpers.each_strategy() do
describe("CP/CP sync works with #" .. strategy .. " inc_sync=" .. inc_sync .. " backend", function()
lazy_setup(function()
Expand Down
3 changes: 1 addition & 2 deletions spec/02-integration/09-hybrid_mode/05-ocsp_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ local function set_ocsp_status(status)
end


-- TODO: reenable the inc sync test
for _, inc_sync in ipairs { "off" } do
for _, inc_sync in ipairs { "on", "off" } do
for _, strategy in helpers.each_strategy() do

describe("cluster_ocsp = on works #" .. strategy .. " inc_sync=" .. inc_sync, function()
Expand Down
3 changes: 1 addition & 2 deletions spec/02-integration/09-hybrid_mode/08-lazy_export_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ local function json_dp(inc_sync)
end


-- TODO: reenable the inc sync test
for _, inc_sync in ipairs { "off" } do
for _, inc_sync in ipairs { "on", "off" } do
for _, strategy in helpers.each_strategy() do

describe("lazy_export with #".. strategy .. " inc_sync=" .. inc_sync, function()
Expand Down
3 changes: 1 addition & 2 deletions spec/02-integration/09-hybrid_mode/13-deprecations_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ local join = require("pl.stringx").join

local ENABLED_PLUGINS = { "dummy" , "reconfiguration-completion"}

-- TODO: reenable the inc sync test
for _, inc_sync in ipairs { "off" } do
for _, inc_sync in ipairs { "on", "off" } do
for _, strategy in helpers.each_strategy({"postgres"}) do
describe("deprecations are not reported on DP but on CP " .. " inc_sync=" .. inc_sync, function()
local cp_prefix = "servroot1"
Expand Down
Loading