Merge 0.9->0.10

[prosody.git] / tests / test.lua

diff --git a/tests/test.lua b/tests/test.lua
index 36c2fd6ec919d1aa2ce7aa3d36022dbbce2258c7..4f6c53358c1fbe16921655fdf0c8ad64b9508d41 100644 (file)
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -20,6 +20,9 @@ function run_all_tests()
        dotest "util.ip"
        dotest "util.stanza"
        dotest "util.sasl.scram"
+       dotest "util.cache"
+       dotest "util.throttle"
+       dotest "util.uuid"
 
        dosingletest("test_sasl.lua", "latin1toutf8");
        dosingletest("test_utf8.lua", "valid");
@@ -138,12 +141,15 @@ function dotest(unitname)
        end
 
        local oldmodule, old_M = _fakeG.module, _fakeG._M;
-       _fakeG.module = function () _M = unit end
+       _fakeG.module = function ()
+               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
-               print("WARNING: ", "Failed to initialise module: "..unitname, err);
+               print("WARNING: ", "Failed to initialise module: "..unitname, ret);
                return;
        end