aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-10 03:57:17 +0100
committerKim Alvefur <zash@zash.se>2016-01-10 03:57:17 +0100
commit1df83ddc8cdb6a93f4b736f461cec71084bbf095 (patch)
tree64202f4daef595ff51640c1810fbb2751775faa4 /tests/test.lua
parent8cdd08825d3ab4afddc12ddf75dc9af1924e8518 (diff)
parent0d98ccd02a37153aef1cbfb71ba9c103d43fbda7 (diff)
downloadprosody-1df83ddc8cdb6a93f4b736f461cec71084bbf095.tar.gz
prosody-1df83ddc8cdb6a93f4b736f461cec71084bbf095.zip
Merge 0.10->trunk
Diffstat (limited to 'tests/test.lua')
-rw-r--r--tests/test.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/test.lua b/tests/test.lua
index 1192b7b8..4f6c5335 100644
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -22,6 +22,7 @@ function run_all_tests()
dotest "util.sasl.scram"
dotest "util.cache"
dotest "util.throttle"
+ dotest "util.uuid"
dosingletest("test_sasl.lua", "latin1toutf8");
dosingletest("test_utf8.lua", "valid");
@@ -145,10 +146,10 @@ function dotest(unitname)
unit._M = unit;
end
setfenv(chunk, unit);
- local success, err = pcall(chunk);
+ 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