dotest "core.s2smanager"
dotest "core.configmanager"
dotest "util.ip"
+ dotest "util.json"
dotest "util.stanza"
dotest "util.sasl.scram"
+ dotest "util.async"
+ dotest "util.cache"
+ dotest "util.throttle"
+ dotest "util.uuid"
+ dotest "util.random"
+ dotest "util.xml"
+ dotest "util.xmppstream"
+ dotest "net.http.parser"
dosingletest("test_sasl.lua", "latin1toutf8");
dosingletest("test_utf8.lua", "valid");
require "util.import"
+local envloadfile = require "util.envload".envloadfile;
+
local env_mt = { __index = function (t,k) return rawget(_realG, k) or print("WARNING: Attempt to access nil global '"..tostring(k).."'"); end };
function testlib_new_env(t)
return setmetatable(t or {}, env_mt);
local tests = setmetatable({}, { __index = _realG });
tests.__unit = testname;
tests.__test = fname;
- local chunk, err = loadfile(testname);
+ local chunk, err = envloadfile(testname, tests);
if not chunk then
print("WARNING: ", "Failed to load tests for "..testname, err);
return;
end
- setfenv(chunk, tests);
local success, err = pcall(chunk);
if not success then
print("WARNING: ", "Failed to initialise tests for "..testname, err);
_fakeG._G = _fakeG;
local tests = setmetatable({}, { __index = _fakeG });
tests.__unit = unitname;
- local chunk, err = loadfile("test_"..unitname:gsub("%.", "_")..".lua");
+ local chunk, err = envloadfile("test_"..unitname:gsub("%.", "_")..".lua", tests);
if not chunk then
print("WARNING: ", "Failed to load tests for "..unitname, err);
return;
end
- setfenv(chunk, tests);
local success, err = pcall(chunk);
if not success then
print("WARNING: ", "Failed to initialise tests for "..unitname, err);
if tests.env then setmetatable(tests.env, { __index = _realG }); end
local unit = setmetatable({}, { __index = setmetatable({ _G = tests.env or _fakeG }, { __index = tests.env or _fakeG }) });
local fn = "../"..unitname:gsub("%.", "/")..".lua";
- local chunk, err = loadfile(fn);
+ local chunk, err = envloadfile(fn, unit);
if not chunk then
print("WARNING: ", "Failed to load module: "..unitname, err);
return;
end
local oldmodule, old_M = _fakeG.module, _fakeG._M;
- _fakeG.module = function () _M = unit end
- setfenv(chunk, unit);
+ _fakeG.module = function ()
+ setmetatable(unit, nil);
+ unit._M = unit;
+ end
local success, ret = pcall(chunk);
_fakeG.module, _fakeG._M = oldmodule, old_M;
if not success then
- print("WARNING: ", "Failed to initialise module: "..unitname, err);
+ print("WARNING: ", "Failed to initialise module: "..unitname, ret);
return;
end