diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-28 15:11:33 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-28 15:11:33 +0100 |
| commit | 3f0e7930eeeb4c2bfc5fffa6830b030716f81a2b (patch) | |
| tree | b4f0b153db833962180e02e297b58bc1b73354ed /tests | |
| parent | 3dd8fb807416165eb0b78a4c9c06e76e1f11c87f (diff) | |
| parent | aeba75d2f4582149a65437cdd6685b7188c4f984 (diff) | |
| download | prosody-3f0e7930eeeb4c2bfc5fffa6830b030716f81a2b.tar.gz prosody-3f0e7930eeeb4c2bfc5fffa6830b030716f81a2b.zip | |
Merge 0.10->trunk
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test.lua | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/test.lua b/tests/test.lua index 4f6c5335..4863c4e7 100644 --- a/tests/test.lua +++ b/tests/test.lua @@ -42,6 +42,8 @@ local _realG = _G; 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); @@ -79,13 +81,12 @@ function dosingletest(testname, fname) 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); @@ -119,13 +120,12 @@ function dotest(unitname) _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); @@ -134,7 +134,7 @@ function dotest(unitname) 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; @@ -145,7 +145,6 @@ function dotest(unitname) setmetatable(unit, nil); unit._M = unit; end - setfenv(chunk, unit); local success, ret = pcall(chunk); _fakeG.module, _fakeG._M = oldmodule, old_M; if not success then |