X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftestsuite.cpp;h=c61e106b66f5dbbea06bc7e980dd686b60adfcd2;hb=19963bd452eac3c9fc52b3ee60fbf1a81efed7d3;hp=d9921a7b826b4527d1e3bd7a003cd40f840ba8bc;hpb=739a4448dbde7d54caf36920eb6fdd56b1ff3e88;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index d9921a7b8..c61e106b6 100644
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -2,7 +2,7 @@
  *	   | Inspire Internet Relay Chat Daemon |
  *	   +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -41,7 +41,7 @@ class TestSuiteThread : public Thread
 	}
 };
 
-TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
+TestSuite::TestSuite()
 {
 	cout << "\n\n*** STARTING TESTSUITE ***\n";
 
@@ -74,12 +74,16 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
 			case '2':
 				cout << "Enter module filename to load: ";
 				cin >> modname;
-				cout << (Instance->Modules->Load(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+				cout << (ServerInstance->Modules->Load(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
 				break;
 			case '3':
 				cout << "Enter module filename to unload: ";
 				cin >> modname;
-				cout << (Instance->Modules->Unload(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+				{
+					Module* m = ServerInstance->Modules->Find(modname);
+					cout << (ServerInstance->Modules->Unload(m) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+					ServerInstance->AtomicActions.Run();
+				}
 				break;
 			case '4':
 				cout << (DoThreadTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
@@ -271,7 +275,7 @@ bool TestSuite::DoThreadTests()
 	cout << "Creating new ThreadEngine class...\n";
 	try
 	{
-		te = new ThreadEngine(ServerInstance);
+		te = new ThreadEngine;
 	}
 	catch (...)
 	{