mod_websocket: Fire pre-session-close event (fixes #1800)
This event was added in a7c183bb4e64 and is required to make mod_smacks know
that a session was intentionally closed and shouldn't be hibernated (see
fcea4d9e7502).
Because this was missing from mod_websocket's session.close(), mod_smacks
would always attempt to hibernate websocket sessions even if they closed
cleanly.
That mod_websocket has its own copy of session.close() is something to fix
another day (probably not in the stable branch). So for now this commit makes
the minimal change to get things working again.
Thanks to Damian and the Jitsi team for reporting.
local multitable = require "util.multitable";
describe("util.multitable", function()
describe("#new()", function()
it("should create a multitable", function()
local mt = multitable.new();
assert.is_table(mt, "Multitable is a table");
assert.is_function(mt.add, "Multitable has method add");
assert.is_function(mt.get, "Multitable has method get");
assert.is_function(mt.remove, "Multitable has method remove");
end);
end);
describe("#get()", function()
it("should allow getting correctly", function()
local function has_items(list, ...)
local should_have = {};
if select('#', ...) > 0 then
assert.is_table(list, "has_items: list is table", 3);
else
assert.is.falsy(list and #list > 0, "No items, and no list");
return true, "has-all";
end
for n=1,select('#', ...) do should_have[select(n, ...)] = true; end
for _, item in ipairs(list) do
if not should_have[item] then return false, "too-many"; end
should_have[item] = nil;
end
if next(should_have) then
return false, "not-enough";
end
return true, "has-all";
end
local function assert_has_all(message, list, ...)
return assert.are.equal(select(2, has_items(list, ...)), "has-all", message or "List has all expected items, and no more", 2);
end
local mt = multitable.new();
local trigger1, trigger2, trigger3 = {}, {}, {};
local item1, item2, item3 = {}, {}, {};
assert_has_all("Has no items with trigger1", mt:get(trigger1));
mt:add(1, 2, 3, item1);
assert_has_all("Has item1 for 1, 2, 3", mt:get(1, 2, 3), item1);
end);
end);
-- Doesn't support nil
--[[ mt:add(nil, item1);
mt:add(nil, item2);
mt:add(nil, item3);
assert_has_all("Has all items with (nil)", mt:get(nil), item1, item2, item3);
]]
end);