diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-10 03:57:17 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-10 03:57:17 +0100 |
| commit | 0f30c79999e4572c62f8f5bdfd29771b746db8d3 (patch) | |
| tree | 64202f4daef595ff51640c1810fbb2751775faa4 /tests/test.lua | |
| parent | fb972a1ea95f574ecacd7a213a04c4cab5e41f56 (diff) | |
| parent | 596cd6813cca26de9864a92650b04aa90d4af3c3 (diff) | |
| download | prosody-0f30c79999e4572c62f8f5bdfd29771b746db8d3.tar.gz prosody-0f30c79999e4572c62f8f5bdfd29771b746db8d3.zip | |
Merge 0.10->trunk
Diffstat (limited to 'tests/test.lua')
| -rw-r--r-- | tests/test.lua | 5 |
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 |