X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tests%2Ftest.lua;h=bb9bc876b517bbdab195b880b5d5aecba9defa11;hb=2ea877a26d10c1a888989d72e236bb317b133ee6;hp=4f41cd1db369397cf19834e6fa9b893b10106c23;hpb=a5c14fa466c0645c2434e54155eb8e0e3eac9054;p=prosody.git

diff --git a/tests/test.lua b/tests/test.lua
index 4f41cd1d..bb9bc876 100644
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -16,7 +16,8 @@ function run_all_tests()
 	dotest "core.s2smanager"
 	dotest "core.configmanager"
 	dotest "util.stanza"
-		
+	dotest "util.sasl.scram"
+	
 	dosingletest("test_sasl.lua", "latin1toutf8");
 end
 
@@ -30,9 +31,11 @@ else
 	package.cpath = package.cpath..";../?.so";
 end
 
+local _realG = _G;
+
 require "util.import"
 
-local env_mt = { __index = function (t,k) return rawget(_G, k) or print("WARNING: Attempt to access nil global '"..tostring(k).."'"); end };
+local env_mt = { __index = function (t,k) return rawget(_realG, k) or print("WARNING: Attempt to access nil global '"..tostring(k).."'"); end };
 function testlib_new_env(t)
 	return setmetatable(t or {}, env_mt);
 end
@@ -66,7 +69,7 @@ end
 
 
 function dosingletest(testname, fname)
-	local tests = setmetatable({}, { __index = _G });
+	local tests = setmetatable({}, { __index = _realG });
 	tests.__unit = testname;
 	tests.__test = fname;
 	local chunk, err = loadfile(testname);
@@ -104,7 +107,9 @@ function dosingletest(testname, fname)
 end
 
 function dotest(unitname)
-	local tests = setmetatable({}, { __index = _G });
+	local _fakeG = setmetatable({}, {__index = _realG});
+	_fakeG._G = _fakeG;
+	local tests = setmetatable({}, { __index = _fakeG });
 	tests.__unit = unitname;
 	local chunk, err = loadfile("test_"..unitname:gsub("%.", "_")..".lua");
 	if not chunk then
@@ -118,18 +123,20 @@ function dotest(unitname)
 		print("WARNING: ", "Failed to initialise tests for "..unitname, err);
 		return;
 	end
-	
-	local unit = setmetatable({}, { __index = setmetatable({ module = function () _M = getfenv(2); end }, { __index = _G }) });
-
+	if tests.env then setmetatable(tests.env, { __index = _realG }); end
+	local unit = setmetatable({}, { __index = setmetatable({ _G = tests.env or _fakeG }, { __index = tests.env or _fakeG }) });
 	local fn = "../"..unitname:gsub("%.", "/")..".lua";
 	local chunk, err = loadfile(fn);
 	if not chunk then
 		print("WARNING: ", "Failed to load module: "..unitname, err);
 		return;
 	end
-
+	
+	local oldmodule, old_M = _fakeG.module, _fakeG._M;
+	_fakeG.module = function () _M = _G end
 	setfenv(chunk, unit);
 	local success, err = pcall(chunk);
+	_fakeG.module, _fakeG._M = oldmodule, old_M;
 	if not success then
 		print("WARNING: ", "Failed to initialise module: "..unitname, err);
 		return;
@@ -146,6 +153,9 @@ function dotest(unitname)
 				print("WARNING: ", unitname.."."..name.." has no test!");
 			end
 		else
+			if verbosity >= 4 then
+				print("INFO: ", "Testing "..unitname.."."..name);
+			end
 			local line_hook, line_info = new_line_coverage_monitor(fn);
 			debug.sethook(line_hook, "l")
 			local success, ret = pcall(test, f, unit);