Merge 0.9->0.10

[prosody.git] / tests / test.lua

diff --git a/tests/test.lua b/tests/test.lua
index 1192b7b83a659f4a2987dd50e7a194d19f6abbd7..4f6c53358c1fbe16921655fdf0c8ad64b9508d41 100644 (file)
--- 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