tests: Fix merge, modulemanager test was removed

[prosody.git] / tests / test.lua

diff --git a/tests/test.lua b/tests/test.lua
index f7fdee91308ad948054eaae0b50f60a7cb1a83f1..1192b7b83a659f4a2987dd50e7a194d19f6abbd7 100644 (file)
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -21,6 +21,7 @@ function run_all_tests()
        dotest "util.stanza"
        dotest "util.sasl.scram"
        dotest "util.cache"
+       dotest "util.throttle"
 
        dosingletest("test_sasl.lua", "latin1toutf8");
        dosingletest("test_utf8.lua", "valid");
@@ -139,9 +140,12 @@ 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);
+       local success, err = pcall(chunk);
        _fakeG.module, _fakeG._M = oldmodule, old_M;
        if not success then
                print("WARNING: ", "Failed to initialise module: "..unitname, err);